tasks: add conditionals for ironic
This patch avoids running the nova_compute.yml playbook entirely because we already skip the setup portion and we don't need to setup SSH keys (as there's no live migration) nor setting up NFS. It also gets rid of the set_fact inside nova_virt_detect.yml because it was non-functional in the first place. This is because the nova_virt_type was set to 'ironic' in the group_vars which meant that the autodetect code was skipped and therefore that portion never ran. Change-Id: Ic5548f08d200402538a0334f801834ee7ef8a39b
This commit is contained in:
parent
80aef4671d
commit
efe094aa67
@ -218,6 +218,7 @@
|
||||
|
||||
- import_tasks: nova_compute.yml
|
||||
when:
|
||||
- nova_virt_type != 'ironic'
|
||||
- "nova_services['nova-compute']['group'] in group_names"
|
||||
tags:
|
||||
- nova-compute
|
||||
@ -229,6 +230,7 @@
|
||||
openstack_service_system_user: "{{ nova_system_user_name }}"
|
||||
openstack_service_venv_bin: "{{ nova_bin }}"
|
||||
when:
|
||||
- nova_virt_type != 'ironic'
|
||||
- "nova_services['nova-compute']['group'] in group_names"
|
||||
- "(nova_libvirt_images_rbd_pool is defined) or
|
||||
(nova_cinder_rbd_inuse | bool)"
|
||||
|
@ -14,8 +14,6 @@
|
||||
# limitations under the License.
|
||||
|
||||
- include_tasks: "drivers/{{ nova_virt_type }}/nova_compute_{{ nova_virt_type }}.yml"
|
||||
when:
|
||||
- nova_virt_type != 'ironic'
|
||||
tags:
|
||||
- nova-install
|
||||
|
||||
|
@ -46,7 +46,7 @@
|
||||
venv_build_distro_package_list: "{{ nova_devel_distro_packages }}"
|
||||
venv_install_destination_path: "{{ nova_bin | dirname }}"
|
||||
venv_pip_install_args: "{{ nova_pip_install_args }}"
|
||||
venv_packages_to_symlink: "{{ (nova_services['nova-compute']['group'] in group_names) | ternary(nova_compute_kvm_packages_to_symlink, []) }}"
|
||||
venv_packages_to_symlink: "{{ (nova_services['nova-compute']['group'] in group_names and nova_virt_type != 'ironic') | ternary(nova_compute_kvm_packages_to_symlink, []) }}"
|
||||
venv_pip_packages: "{{ nova_venv_packages }}"
|
||||
venv_facts_when_changed:
|
||||
- section: "nova"
|
||||
|
@ -40,10 +40,4 @@
|
||||
set_fact:
|
||||
nova_virt_type: "qemu"
|
||||
when:
|
||||
- nova_virt_type is not defined
|
||||
|
||||
- name: Remove lib linking for kvm with ironic
|
||||
set_fact:
|
||||
nova_compute_kvm_packages_to_symlink: []
|
||||
when:
|
||||
- nova_virt_type == 'ironic'
|
||||
- nova_virt_type is not defined
|
Loading…
Reference in New Issue
Block a user