Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Adding nova::network::neutron to nova-conductor
Browse files Browse the repository at this point in the history
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 6392cc6)
(cherry picked from commit 871743d)
  • Loading branch information
valleedelisle committed May 26, 2021
1 parent 3067f82 commit 6810790
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions manifests/profile/base/nova/conductor.pp
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@
}
if $step >= 4 {
include nova::conductor
include nova::network::neutron
}
}
2 changes: 2 additions & 0 deletions spec/classes/tripleo_profile_base_nova_conductor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class { 'tripleo::profile::base::nova':
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

Expand All @@ -44,6 +45,7 @@ class { 'tripleo::profile::base::nova':
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
Expand Down

0 comments on commit 6810790

Please sign in to comment.