diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-29 19:30:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-29 19:30:35 +0000 |
| commit | 654a8ffbe226f23d2995ab061bc2b5ae365c979d (patch) | |
| tree | 9357b6c3795aaf79335e5798395201cdfd6ae7fe | |
| parent | cb32b2b8d9c9aaae2ce08a58ebce37f7cad8224e (diff) | |
| parent | 9092f4a10495af9f2def15518e81d4ae5ea5f102 (diff) | |
| download | kolla-654a8ffbe226f23d2995ab061bc2b5ae365c979d.tar.gz kolla-654a8ffbe226f23d2995ab061bc2b5ae365c979d.zip | |
Merge "Fix removing nova_libvirt container issue"
| -rw-r--r-- | ansible/roles/nova/tasks/do_reconfigure.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/start_compute.yml | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ansible/roles/nova/tasks/do_reconfigure.yml b/ansible/roles/nova/tasks/do_reconfigure.yml index 2035fb022..b551dd92a 100644 --- a/ansible/roles/nova/tasks/do_reconfigure.yml +++ b/ansible/roles/nova/tasks/do_reconfigure.yml @@ -164,12 +164,16 @@ name: "{{ item[0]['name'] }}" action: "remove_container" register: remove_containers + until: remote_container|success + retries: "{{ item[0]['retries']|default(0) }}" when: - inventory_hostname in groups[item[0]['group']] - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE' - item[2]['rc'] == 1 with_together: - - [{ name: nova_libvirt, group: compute }, + # NOTE(Jeffrey4l): retry 1 to remove nova_libvirt container because when + # guests running, nova_libvirt will raise error even though it is removed. + - [{ name: nova_libvirt, group: compute, retries: 1 }, { name: nova_ssh, group: compute }, { name: nova_conductor, group: nova-conductor }, { name: nova_api, group: nova-api }, diff --git a/ansible/roles/nova/tasks/start_compute.yml b/ansible/roles/nova/tasks/start_compute.yml index 7e79976b1..7afe664a2 100644 --- a/ansible/roles/nova/tasks/start_compute.yml +++ b/ansible/roles/nova/tasks/start_compute.yml @@ -18,6 +18,11 @@ - "libvirtd:/var/lib/libvirt" - "nova_compute:/var/lib/nova/" - "nova_libvirt_qemu:/etc/libvirt/qemu" + register: start_nova_libvirt_container + # NOTE(Jeffrey4l): retry 1 to remove nova_libvirt container because when + # guests running, nova_libvirt will raise error even though it is removed. + retries: 1 + until: start_nova_libvirt_container|success when: inventory_hostname in groups['compute'] - name: Prepare volumes list |