aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/config-osa
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-10-24 09:28:08 +0800
committerwutianwei <wutianwei1@huawei.com>2017-10-24 09:28:08 +0800
commit660b8bfbb0546322f35f8c7f54d62e1bf5d5dd95 (patch)
tree024a72ae6ded612befd393fff94e84bf130e5905 /deploy/adapters/ansible/roles/config-osa
parentf5bf127f802fcb43e3e659996feedc15961d229e (diff)
bugfix
When not define ceph role in DHA, there are somes issue on config-osa. This patch add the judgement to check the parameter define or not. Change-Id: If221fd3d02c87fc60f545b44f94043f38e34d283 Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa')
-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