]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Changing when statements
authorpprokop <pprokop@gklab-126-023.igk.intel.com>
Wed, 30 Mar 2016 10:38:47 +0000 (12:38 +0200)
committerpprokop <pprokop@gklab-126-023.igk.intel.com>
Wed, 30 Mar 2016 10:38:47 +0000 (12:38 +0200)
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/docker/start_docker_monitor.yml

index e4c00338bda7bd78b4a475b29b4064be84055543..d34c359fd86a4e8169f167369b6f0d2368b8a93c 100644 (file)
@@ -14,7 +14,8 @@
       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 +24,8 @@
 
 # let the first mon create configs and keyrings
 - include: create_configs.yml
-  when: inventory_hostname == groups.mons[0] and not 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
index 3bc2055bc6b615c8d3b3d5d9939cb5cadd1c0979..c58768f177c81cf93740ffafceb9e63c574739c5 100644 (file)
     volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
   when:
     not is_atomic and
-    ansible_os_family != 'CoreOS'
-    and not mon_containerized_deployment_with_kv
+    ansible_os_family != 'CoreOS' and
+    not mon_containerized_deployment_with_kv
 
 - name: run the ceph monitor docker image with kv
   docker:
     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
+    ansible_os_family != 'CoreOS' and
+    mon_containerized_deployment_with_kv