Adding nova::network::neutron to nova-conductor

When deploying multiple compute cells, conductor module needs to source
the nova::network::neutron module otherwise the neutron settings are not
configured on the cell conductor node.

Closes-Bug: #1929427
Change-Id: I236ab69175877f8ec5d3b1bef732486ae2b15b9d
(cherry picked from commit 6392cc6620)
(cherry picked from commit 871743dd72)
(cherry picked from commit 6810790017)
This commit is contained in:
David Vallee Delisle 2021-05-21 10:09:41 -04:00
parent e09d2a192c
commit 33bfb4a08d
2 changed files with 3 additions and 0 deletions

View File

@ -45,5 +45,6 @@ class tripleo::profile::base::nova::conductor (
} }
if $step >= 4 { if $step >= 4 {
include nova::conductor include nova::conductor
include nova::network::neutron
} }
} }

View File

@ -34,6 +34,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::nova::conductor') is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova') is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to_not contain_class('nova::conductor') is_expected.to_not contain_class('nova::conductor')
is_expected.to_not contain_class('nova::network::neutron')
} }
end end
@ -44,6 +45,7 @@ eos
is_expected.to contain_class('tripleo::profile::base::nova::conductor') is_expected.to contain_class('tripleo::profile::base::nova::conductor')
is_expected.to contain_class('tripleo::profile::base::nova') is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova::conductor') is_expected.to contain_class('nova::conductor')
is_expected.to contain_class('nova::network::neutron')
} }
end end
end end