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. Conflict: manifests/profile/base/nova/conductor.pp NOTE(dvd):1523a4b
Convert all class usage to relative names Closes-Bug: #1929427 Change-Id: I236ab69175877f8ec5d3b1bef732486ae2b15b9d (cherry picked from commit6392cc6620
) (cherry picked from commit871743dd72
) (cherry picked from commit6810790017
) (cherry picked from commit33bfb4a08d
)
This commit is contained in:
parent
44b64a167b
commit
0e38a628ff
|
@ -45,5 +45,6 @@ class tripleo::profile::base::nova::conductor (
|
|||
}
|
||||
if $step >= 4 {
|
||||
include ::nova::conductor
|
||||
include ::nova::network::neutron
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,6 +34,7 @@ eos
|
|||
is_expected.to contain_class('tripleo::profile::base::nova::conductor')
|
||||
is_expected.to contain_class('tripleo::profile::base::nova')
|
||||
is_expected.to_not contain_class('nova::conductor')
|
||||
is_expected.to_not contain_class('nova::network::neutron')
|
||||
}
|
||||
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')
|
||||
is_expected.to contain_class('nova::conductor')
|
||||
is_expected.to contain_class('nova::network::neutron')
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue