From 237e613a175fd975bf6679646eaf092ff6725015 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 27 Jul 2017 12:54:30 -0600 Subject: Fix nova and selinux unit tests The unit tests jobs are failing because of missing pre conditions for the new shared class introduced by Ib233689fdcdda391596d01a21f77bd8e1672ae04. Additionally this change moved some classes around so that the tests are now failing due to duplicate class declarations for nova::compute::libvirt::services. This change moves the include that pulls in the declaration first prior to the include that exists in tripleo::profile::base::nova::libvirt. The selinux test was also failing due to a type issue with the fact being used (boolean vs string) Change-Id: I5bd4b61d6008820729d58f7743e7e61955dd6f51 Closes-Bug: #1707034 --- manifests/profile/base/nova/libvirt.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/profile/base/nova') diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp index 332e33b..83f0c38 100644 --- a/manifests/profile/base/nova/libvirt.pp +++ b/manifests/profile/base/nova/libvirt.pp @@ -26,6 +26,8 @@ class tripleo::profile::base::nova::libvirt ( $step = Integer(hiera('step')), ) { + include ::tripleo::profile::base::nova::compute_libvirt_shared + if $step >= 4 { include ::tripleo::profile::base::nova include ::tripleo::profile::base::nova::migration::client @@ -47,6 +49,4 @@ class tripleo::profile::base::nova::libvirt ( include ::nova::compute::libvirt::qemu } - include ::tripleo::profile::base::nova::compute_libvirt_shared - } -- cgit 1.2.3-korg