Ensure tasks are not skipped
- The lookup of the first file should only be skipped when necessary (the apt bits). - On the block/rescue: The rescue task didn't run, so if the when didn't trigger, no virt will be set, unless the ``cat /proc/cpuinfo`` failed. Change-Id: I6e89de1c9d1828003a83c5ca2b5b56d64c12f30c
This commit is contained in:
parent
33b2472724
commit
06af48b45b
@ -25,7 +25,8 @@
|
||||
- always
|
||||
|
||||
- name: Fail when virt type is unsupported
|
||||
fail: msg="Unsupported Virt Type Provided {{ nova_supported_virt_types }}"
|
||||
fail:
|
||||
msg: "Unsupported Virt Type Provided {{ nova_supported_virt_types }}"
|
||||
when:
|
||||
- nova_virt_type is defined
|
||||
- nova_virt_type not in nova_supported_virt_types
|
||||
|
@ -17,7 +17,6 @@
|
||||
with_first_found:
|
||||
- files:
|
||||
- "nova_compute_{{ nova_virt_type }}.yml"
|
||||
skip: true
|
||||
paths:
|
||||
- "drivers/{{ nova_virt_type }}/"
|
||||
tags:
|
||||
|
@ -153,13 +153,7 @@
|
||||
with_items:
|
||||
- "{{ install_nova_role_packages.results }}"
|
||||
|
||||
- include: "{{ item }}"
|
||||
with_first_found:
|
||||
- files:
|
||||
- "nova_console_{{ nova_console_type }}_install.yml"
|
||||
skip: true
|
||||
paths:
|
||||
- "consoles/"
|
||||
- include: "consoles/nova_console_{{ nova_console_type }}_install.yml"
|
||||
when:
|
||||
- "'nova_console' in group_names"
|
||||
tags:
|
||||
|
@ -13,6 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Only PowerVM needs to load a separate file. Skip for the others.
|
||||
- include: "{{ item }}"
|
||||
with_first_found:
|
||||
- files:
|
||||
|
@ -13,7 +13,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- block:
|
||||
- name: Get CPU info content and store as var
|
||||
command: cat /proc/cpuinfo
|
||||
register: cpuinfo_contents
|
||||
@ -21,10 +20,17 @@
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Register a fact for the nova qemu virt type
|
||||
set_fact:
|
||||
nova_virt_type: "qemu"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Register a fact for the nova kvm virt type
|
||||
set_fact:
|
||||
nova_virt_type: "kvm"
|
||||
when: cpuinfo_contents.stdout.find('vmx') != -1
|
||||
when:
|
||||
- cpuinfo_contents.stdout.find('vmx') != -1
|
||||
or cpuinfo_contents.stdout.find('svm') != -1
|
||||
or cpuinfo_contents.stdout.find('PowerNV') != -1
|
||||
or (cpuinfo_contents.stdout.find('pSeries') != -1
|
||||
@ -42,9 +48,3 @@
|
||||
- cpuinfo_contents.stdout.find('qemu') == -1
|
||||
tags:
|
||||
- nova-virt-type-set
|
||||
rescue:
|
||||
- name: Register a fact for the nova qemu virt type
|
||||
set_fact:
|
||||
nova_virt_type: "qemu"
|
||||
tags:
|
||||
- always
|
||||
|
Loading…
Reference in New Issue
Block a user