Merge pull request #1267 from ceph/container-systemd

Container systemd

roles/ceph-docker-common/tasks/main.yml

@@ -0,0 +1,2 @@
+---
+- include: system_checks.yml

roles/ceph-docker-common/tasks/system_checks.yml

@@ -0,0 +1,5 @@
+---
+- name: fail if systemd is not present
+  fail:
+    msg: "Systemd must be present"
+  when: ansible_service_mgr != 'systemd'

roles/ceph-mds/tasks/docker/start_docker_mds.yml

@@ -8,26 +8,22 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: link systemd unit file for mds instance
   file:
     src: /var/lib/ceph/ceph-mds@.service
     dest: /etc/systemd/system/multi-user.target.wants/ceph-mds@{{ ansible_hostname }}.service
     state: link
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for mds instance
   command: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-mds@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   command: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: systemd start mds container
   service:

roles/ceph-mon/tasks/docker/main.yml

@@ -62,21 +62,29 @@
 
 - include: start_docker_monitor.yml
 
-# NOTE: if we don't wait we will attempt to copy config to ansible host
-# before admin key is ready, preventing future daemons e.g. ceph-mds from
-# properly retrieving key
-- name: "wait for {{ cluster }}.client.admin.keyring exists"
-  wait_for:
-    path: /etc/ceph/{{ cluster }}.client.admin.keyring
-  when: cephx
+- name: wait for monitor socket to exist
+  command: docker exec {{ ansible_hostname }} stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok
+  register: monitor_socket
+  retries: 5
+  delay: 10
+  until: monitor_socket.rc == 0
+
+- name: force peer addition as potential bootstrap peer for cluster bringup
+  command: docker exec {{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + ceph_mon_docker_interface].ipv4.address }}
+  with_items: "{{ groups.mons }}"
+  changed_when: false
+  failed_when: false
+  when:
+    - inventory_hostname == groups.mons[0]
+    - not mon_containerized_deployment_with_kv
 
 - include: copy_configs.yml
   when: not mon_containerized_deployment_with_kv
 
 - name: create ceph rest api keyring when mon is containerized
-  command: docker exec {{ ansible_hostname }} ceph auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/ceph.client.restapi.keyring
+  command: docker exec {{ ansible_hostname }} ceph --cluster {{ cluster }} auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/{{ cluster }}.client.restapi.keyring
   args:
-     creates: /etc/ceph/ceph.client.restapi.keyring
+     creates: /etc/ceph/{{ cluster }}.client.restapi.keyring
   changed_when: false
   when:
     - cephx

roles/ceph-mon/tasks/docker/start_docker_monitor.yml

@@ -40,7 +40,6 @@
     image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
   when: mon_containerized_deployment_with_kv
 
-# Use systemd to manage container on Atomic host and CoreOS
 - name: generate systemd unit file
   become: true
   template:
@@ -49,19 +48,16 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when:  ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for mon instance
   shell: systemctl enable ceph-mon@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: systemd start mon container
   service:

roles/ceph-mon/templates/ceph-mon.service.j2

@@ -5,7 +5,7 @@ After=docker.service
 [Service]
 EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/docker rm %i
-ExecStartPre=/usr/bin/mkdir -p /etc/ceph /var/lib/ceph/mon
+ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon
 ExecStart=/usr/bin/docker run --rm --name %i --net=host \
    {% if not mon_containerized_deployment_with_kv -%}
    -v /var/lib/ceph:/var/lib/ceph \

roles/ceph-nfs/tasks/docker/start_docker_nfs.yml

@@ -8,34 +8,22 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: link systemd unit file for NFS instance
   file:
     src: /var/lib/nfs/ganesha/ceph-nfs@.service
     dest: /etc/systemd/system/multi-user.target.wants/ceph-nfs@{{ ansible_hostname }}.service
     state: link
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for NFS instance
   shell: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-nfs@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: systemd start NFS container
   service:

roles/ceph-osd/tasks/docker/start_docker_osd.yml

@@ -67,7 +67,6 @@
     - ceph_osd_docker_prepare_env is defined
     - osd_containerized_deployment_with_kv
 
-# Use systemd to manage container on appropriate host
 - name: generate systemd unit file
   become: true
   template:
@@ -77,20 +76,17 @@
     group: "root"
     mode: "0644"
   failed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for osd instance
   shell: systemctl enable ceph-osd@{{ item | basename }}.service
   failed_when: false
   changed_when: false
   with_items: "{{ ceph_osd_docker_devices }}"
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: systemd start osd container
   service:

roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml

@@ -8,19 +8,16 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for rbd mirror instance
   command: systemctl enable ceph-rbd-mirror@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   command: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: systemd start rbd mirror container
   service:

roles/ceph-rgw/tasks/docker/start_docker_rgw.yml

@@ -8,26 +8,22 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: link systemd unit file for rgw instance
   file:
     src: /var/lib/ceph/ceph-rgw@.service
     dest: /etc/systemd/system/multi-user.target.wants/ceph-rgw@{{ ansible_hostname }}.service
     state: link
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for rgw instance
   shell: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-rgw@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: systemd start rgw container
   service: