openstack
/
fuel-library
Code Issues Proposed changes

Revert "[Ironic] Configure neutron-server only on controllers" 

This reverts commit 3f60c994e9.

Change-Id: Ie68508b29049b3ea827d891e2df3480aec8f54d9
Closes-bug: #1520349
This commit is contained in:
Sergey Vasilenko 2015-11-26 19:35:47 +00:00
parent 3f60c994e9
commit 800f291f8b
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/osnailyfacter/modular/openstack-network/plugins/ml2.pp
View File

@ -9,12 +9,12 @@ if $use_neutron {
include ::neutron::params
$role = hiera('role')
$node_name = hiera('node_name')
$controller = $role in ['controller', 'primary-controller']
$primary_controller = $role in ['primary-controller']
$compute = $role in ['compute']
$neutron_config = hiera_hash('neutron_config')
$neutron_server_enable = pick($neutron_config['neutron_server_enable'], true)
$neutron_nodes = hiera_hash('neutron_nodes')
$management_vip = hiera('management_vip')
$service_endpoint = hiera('service_endpoint', $management_vip)
@ -128,7 +128,7 @@ if $use_neutron {
include ::neutron::db::sync
}
if $node_name in keys($neutron_nodes) {
if ! $compute {
if $neutron_server_enable {
$service_ensure = 'running'
} else {

4
tests/noop/spec/hosts/openstack-network/plugins/ml2_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'openstack-network/plugins/ml2.pp'
describe manifest do
shared_examples 'catalog' do
if (Noop.hiera('use_neutron') and Noop.hiera('role') =~ /controller|compute|ironic/)
if (Noop.hiera('use_neutron') and Noop.hiera('role') =~ /controller|compute/)
let(:network_scheme) do
Noop.hiera_hash('network_scheme', {})
@ -183,8 +183,6 @@ describe manifest do
end
elsif role == 'compute'
it { should_not contain_service('neutron-server') }
elsif role == 'ironic'
it { should_not contain_service('neutron-server') }
end
end
end