From 0e38a628ffa69d461848d5d1e442257d7b0b37d6 Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
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.

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 commit 6392cc6620413daefb0bcba3838f303663a4eb58)
(cherry picked from commit 871743dd726973c2ee3c731083d7d83e75f8f4d7)
(cherry picked from commit 6810790017e8bb4362d7f65b611b91c650c90064)
(cherry picked from commit 33bfb4a08da94bf685c540828699414cfe09ce1c)
---
 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 8f9f91635..4cd3e69e5 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 dbb1ef0ef..d81d2e81b 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