Merge "Octavia: handle empty amphora image search result" into stable/ussuri
This commit is contained in:
commit
2981f09581
|
@ -44,7 +44,9 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
image_id: "{{ glance_id_result.stdout }}"
|
image_id: "{{ glance_id_result.stdout }}"
|
||||||
when:
|
when:
|
||||||
|
- glance_id_result.rc is defined
|
||||||
- glance_id_result.rc == 0
|
- glance_id_result.rc == 0
|
||||||
|
- glance_id_result.stdout != ""
|
||||||
|
|
||||||
- name: get checksum if there's an image in glance already
|
- name: get checksum if there's an image in glance already
|
||||||
shell: |
|
shell: |
|
||||||
|
@ -62,6 +64,7 @@
|
||||||
set_fact:
|
set_fact:
|
||||||
current_md5: "{{ glance_results.stdout }}"
|
current_md5: "{{ glance_results.stdout }}"
|
||||||
when:
|
when:
|
||||||
|
- glance_results.rc is defined
|
||||||
- glance_results.rc == 0
|
- glance_results.rc == 0
|
||||||
|
|
||||||
- name: determine if the image needs to be replaced
|
- name: determine if the image needs to be replaced
|
||||||
|
|
Loading…
Reference in New Issue