Use direct include instead of "with_first_found"
We specify the full path and are not searching for a generic file, we should rather use a direct include instead of using "with_first_found". Additionally, we need the include paths within drivers/virt_type to be relative rather than absolute - otherwise these files fail to be included properly. Change-Id: Ie9bd6d778d134bcba28f19a5e7895ccb8bb26da9
This commit is contained in:
parent
acda421e6a
commit
6ce3958ed4
@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- include: drivers/kvm/nova_compute_kvm_install.yml
|
||||
- include: nova_compute_kvm_install.yml
|
||||
tags:
|
||||
- nova-config
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
- nova-kvm
|
||||
|
||||
- name: Set kernel permissions to enable libguestfs features (Ubuntu)
|
||||
include: drivers/kvm/nova_kernel_permissions.yml
|
||||
include: nova_kernel_permissions.yml
|
||||
when:
|
||||
- ansible_distribution == 'Ubuntu'
|
||||
- nova_libvirt_inject_key | bool or nova_libvirt_inject_password | bool
|
||||
@ -113,13 +113,13 @@
|
||||
- nova-kvm
|
||||
- nova-libvirt
|
||||
|
||||
- include: drivers/kvm/nova_disable_smt.yml
|
||||
- include: nova_disable_smt.yml
|
||||
when:
|
||||
- ansible_architecture == 'ppc64le'
|
||||
tags:
|
||||
- nova-config
|
||||
|
||||
- include: drivers/kvm/nova_compute_kvm_virsh_net_remove.yml
|
||||
- include: nova_compute_kvm_virsh_net_remove.yml
|
||||
tags:
|
||||
- nova-config
|
||||
- nova-kvm
|
||||
|
@ -13,12 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- include: "{{ item }}"
|
||||
with_first_found:
|
||||
- files:
|
||||
- "nova_compute_{{ nova_virt_type }}.yml"
|
||||
paths:
|
||||
- "drivers/{{ nova_virt_type }}/"
|
||||
- include: "drivers/{{ nova_virt_type }}/nova_compute_{{ nova_virt_type }}.yml"
|
||||
tags:
|
||||
- nova-install
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user