Changing when statements

pull/666/head
pprokop 2016-03-30 12:38:47 +02:00
parent eaa259146e
commit eb9c3eae13
2 changed files with 8 additions and 6 deletions

View 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

View File

@ -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