summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-osa/tasks
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-10-24 12:21:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-24 12:21:42 +0000
commitde2ba2c73205c2580f87a73fe7974ae8a8368093 (patch)
tree06bdbbd1b9e1f28faa1fa8a4819fd66b671224ca /deploy/adapters/ansible/roles/config-osa/tasks
parent95ce514ef39a87f69956e08d6948291fce4b32c7 (diff)
parent660b8bfbb0546322f35f8c7f54d62e1bf5d5dd95 (diff)
Merge "bugfix"
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa/tasks')
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml18
1 files changed, 12 insertions, 6 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index d2ce5c38..d96a83da 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -235,24 +235,30 @@
src: user_ceph.yml
dest: /etc/openstack_deploy/user_ceph.yml
when:
- - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
- - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_mon'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_osd'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
- name: render ceph.yml.j2
template:
src: ceph.yml.j2
dest: /etc/openstack_deploy/conf.d/ceph.yml
when:
- - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
- - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_mon'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_osd'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
- name: render user_variables_ceph.yml.j2
template:
src: user_variables_ceph.yml.j2
dest: /etc/openstack_deploy/user_variables_ceph.yml
when:
- - "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
- - "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_mon'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_mon'] | length > 0 }}"
+ - hostvars[inventory_hostname]['groups']['ceph_osd'] is defined and
+ "{{ hostvars[inventory_hostname]['groups']['ceph_osd'] | length > 0 }}"
- name: adapt no ha scenario
include: noha.yml