Adding support for non atomic and non CoreOS machines for deploying containerized...

diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
index 48fb8ad6d833a3710958c6941a5f7ea1644ca263..3bc2055bc6b615c8d3b3d5d9939cb5cadd1c0979 100644 (file)
--- a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
+++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@ -102,3 +102,17 @@
   when:
     not is_atomic and
     ansible_os_family != 'CoreOS'
+    and not mon_containerized_deployment_with_kv
+
+- name: run the ceph monitor docker image with kv
+  docker:
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}"
+    name: "{{ ansible_hostname }}"
+    net: "host"
+    state: "running"
+    privileged: "{{ mon_docker_privileged }}"
+    env: "KV_TYPE={{kv_type}},KV_IP={{kv_endpoint}},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 }}"
+  when:
+    not is_atomic and
+    ansible_os_family != 'CoreOS'
+    and mon_containerized_deployment_with_kv