From eb9c3eae13f5e5de4a8ec257b2195d90bc22bcdd Mon Sep 17 00:00:00 2001 From: pprokop Date: Wed, 30 Mar 2016 12:38:47 +0200 Subject: [PATCH] Changing when statements --- roles/ceph-mon/tasks/docker/main.yml | 6 ++++-- roles/ceph-mon/tasks/docker/start_docker_monitor.yml | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml index e4c00338b..d34c359fd 100644 --- a/roles/ceph-mon/tasks/docker/main.yml +++ b/roles/ceph-mon/tasks/docker/main.yml @@ -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 diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml index 3bc2055bc..c58768f17 100644 --- a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml +++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml @@ -101,8 +101,8 @@ 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: @@ -114,5 +114,5 @@ 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 -- 2.39.5