openstack/instack-undercloud
Code Issues Proposed changes

Remove duplicate entry for neutron::service_plugins

Browse Source 
"segments" was needed for routed networks in
I4b384bab2af9f6ba07a137a37f4098a00ce18bc0
it should have been added to the existing list

Closes-Bug: #1754683
Change-Id: I1cfb6b56b520124e8c5b95968dd61f98945f689b
This commit is contained in:
Derek Higgins
2018-03-08 14:37:59 +00:00
parent ee94c3a259
commit 565a7f41be
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@@ -241,7 +241,7 @@ mysql::server::root_password: {{UNDERCLOUD_DB_PASSWORD}}
neutron::debug: "%{hiera('debug')}"
neutron::bind_host: {{LOCAL_IP}}
neutron::core_plugin: ml2
neutron::service_plugins: ['router']
neutron::service_plugins: ['router', 'segments']
neutron::dhcp_agents_per_network: 2
neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
neutron::server::api_workers: "%{::os_workers}"
@@ -275,7 +275,6 @@ neutron::keystone::auth::admin_url: {{UNDERCLOUD_ENDPOINT_NEUTRON_ADMIN}}
neutron::keystone::auth::password: {{UNDERCLOUD_NEUTRON_PASSWORD}}
neutron::keystone::auth::region: "%{hiera('keystone_region')}"
neutron::plugins::ml2::extension_drivers: 'port_security'
neutron::service_plugins: ['segments']
neutron::agents::ml2::networking_baremetal::user: 'ironic'
neutron::agents::ml2::networking_baremetal::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
neutron::agents::ml2::networking_baremetal::auth_url: {{UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC}}