diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2017-10-24 09:28:08 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2017-10-28 01:35:40 +0000 |
| commit | 6c6c426adc92183046b7baf9f9a03e34516e5a79 (patch) | |
| tree | 37a0f0f2307b78832c5e2d728e350528cd77455e /deploy/adapters/ansible/roles/config-osa | |
| parent | 466732f9477b9ad208761651290c6c046ba5f690 (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>
(cherry picked from commit 660b8bfbb0546322f35f8c7f54d62e1bf5d5dd95)
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa')
| -rwxr-xr-x | deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 18 |
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 8e5caf85..edd1bc0b 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -229,24 +229,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 |