From 871743dd726973c2ee3c731083d7d83e75f8f4d7 Mon Sep 17 00:00:00 2001 From: David Vallee Delisle Date: Fri, 21 May 2021 10:09:41 -0400 Subject: [PATCH] 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 6392cc6620413daefb0bcba3838f303663a4eb58) --- manifests/profile/base/nova/conductor.pp | 1 + spec/classes/tripleo_profile_base_nova_conductor_spec.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp index 458ac3d06..319e03f94 100644 --- a/manifests/profile/base/nova/conductor.pp +++ b/manifests/profile/base/nova/conductor.pp @@ -45,5 +45,6 @@ class tripleo::profile::base::nova::conductor ( } if $step >= 4 { include nova::conductor + include nova::network::neutron } } diff --git a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb index 4aed8a263..b9727b805 100644 --- a/spec/classes/tripleo_profile_base_nova_conductor_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_conductor_spec.rb @@ -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