Merge pull request #812 from rootfs/fix

some fixes for container deployment

diff --cc group_vars/all.docker.sample
Simple merge

diff --cc roles/ceph-mon/tasks/docker/start_docker_monitor.yml
index dbe2dc51cbd6b2785332adbf97971f9d38389086,6cc9053ab3a1256596a376a04768d02bcc2c3aa4..53533952565f25bf64fdea370dc8f7db036705f0
--- 1/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
--- 2/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
+++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@@ -90,10 -90,10 +90,10 @@@
      net: "host"
      state: "running"
      privileged: "{{ mon_docker_privileged }}"
 -    env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},{{ ceph_mon_extra_envs }}"
 +    env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},CEPH_FSID={{ fsid }},{{ ceph_mon_extra_envs }}"
      volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
    when:
-     - not is_atomic
+     - ansible_os_family != 'RedHat'
      - ansible_os_family != 'CoreOS'
      - not mon_containerized_deployment_with_kv
  

diff --cc roles/ceph-osd/tasks/docker/start_docker_osd.yml
Simple merge