Merge pull request #666 from PiotrProkop/ceph-mon-fix

Adding support for non atomic and non CoreOS machines for deploying containerized mons with kv backend

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

@@ -14,7 +14,9 @@
       is_atomic='{{ stat_ostree.stat.exists }}'
 
 - include: checks.yml
-  when: ceph_health.rc != 0 and not mon_containerized_deployment_with_kv
+  when:
+    ceph_health.rc != 0 and
+    not mon_containerized_deployment_with_kv
 
 - include: pre_requisite.yml
 
@@ -23,7 +25,9 @@
 
 # let the first mon create configs and keyrings
 - include: create_configs.yml
-  when: inventory_hostname == groups.mons[0] and mon_containerized_default_ceph_conf_with_kv
+  when:
+    inventory_hostname == groups.mons[0] and
+    not mon_containerized_default_ceph_conf_with_kv
 
 - include: fetch_configs.yml
   when: not mon_containerized_deployment_with_kv

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

@@ -105,4 +105,18 @@
     volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
   when:
     not is_atomic and
-    ansible_os_family != 'CoreOS'
+    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