summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-12-17 14:24:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-17 14:24:45 +0000
commit4f3401e17a3a0ac2eb4bc7ab242b33f2ab6ff3e8 (patch)
tree098fed75b132759e0494539e2ccfea3204063330
parent58ca623f89b9367c65ff07e01648c649ab64a5f2 (diff)
parent895e453e065c4ca23722ace69c0c2707c494624a (diff)
Merge "Bug fix for the random failure of nova cell_v2 discovery"
-rwxr-xr-xdeploy/adapters/ansible/roles/config-osa/tasks/main.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index ac4ce418..75e89b06 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -53,6 +53,19 @@
insertafter: '^ - qemu-img-ev'
line: ' - libvirt'
+- name: fix the problem of nova cell_v2 discovery
+ blockinfile:
+ dest: /etc/ansible/roles/os_nova/tasks/nova_db_post_setup.yml
+ insertafter: 'nova-manage cell_v2 discover_hosts'
+ block: |
+ # add retry
+ register: cell_v2_discovery
+ until: cell_v2_discovery == 0
+ retries: 10
+ delay: 5
+ ignore_errors: true
+ when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'Ubuntu'
+
- name: remove CentOS-Base.repo after ceph-osd
blockinfile:
dest: /etc/ansible/roles/ceph-osd/tasks/start_osds.yml