Merge pull request #852 from rootfs/doc-fix

be explicit on Atomic VirtualBox instruction

README.md

@@ -242,7 +242,7 @@ Attention, ceph-common doesn't manage backports repository, you must add it your
 If you want to run containerized deployment on Atomic systems (RHEL/CentOS Atomic), please copy
 [vagrant.yml.atomic](vagrant_variables.yml.atomic) to vagrant_variables.yml, and copy [group_vars/all.docker](group_vars/all.docker) to `group_vars/all`.
 
-Since `centos/atomic-host` doesn't have spare storage controller to attach more disks, it is likely the first time `vagrant up --provider=virtualbox` runs, it will fail to attach to a storage controller. In such case, run the following command:
+Since `centos/atomic-host` VirtualBox box doesn't have spare storage controller to attach more disks, it is likely the first time `vagrant up --provider=virtualbox` runs, it will fail to attach to a storage controller. In such case, run the following command:
 
 ```console
 VBoxManage storagectl `VBoxManage list vms |grep ceph-ansible_osd0|awk '{print $1}'|tr \" ' '` --name "SATA" --add sata

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

@@ -91,6 +91,14 @@
   tags:
     with_pkg
 
+- name: start docker service
+  service:
+    name: docker
+    state: started
+    enabled: yes
+  tags:
+    with_pkg
+
 # NOTE (jimcurtis): need at least version 1.9.0 of six or we get:
 # re:NameError: global name 'DEFAULT_DOCKER_API_VERSION' is not defined
 - name: install six

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

@@ -8,34 +8,26 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic 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:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic 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:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   command: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: systemd start mds container
   service:
@@ -43,9 +35,7 @@
     state: started
     enabled: yes
   changed_when: false
-  when:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: run the ceph metadata docker image
   docker:
@@ -55,6 +45,4 @@
     state: running
     env: "CEPH_DAEMON=MDS,CEPHFS_CREATE=1,{{ ceph_mds_docker_extra_env }}"
     volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
-  when:
+  when: ansible_os_family != 'RedHat' and ansible_os_family != 'CoreOS'
-    not is_atomic and
-    ansible_os_family != 'CoreOS'

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

@@ -8,34 +8,26 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic 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:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic 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:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: systemd start rgw container
   service:
@@ -43,9 +35,7 @@
     state: started
     enabled: yes
   changed_when: false
-  when:
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
-    is_atomic or
-    ansible_os_family == 'CoreOS'
 
 - name: run the rados gateway docker image
   docker:
@@ -56,6 +46,4 @@
     state: running
     env: "CEPH_DAEMON=RGW,{{ ceph_rgw_docker_extra_env }}"
     volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
-  when:
+  when: ansible_os_family != 'RedHat' and ansible_os_family != 'CoreOS'
-    not is_atomic and
-    ansible_os_family != 'CoreOS'