openstack
/
tripleo-heat-templates
Code Issues Proposed changes

neutron: force project_name for midonet & bigswitch 

Related to https://review.opendev.org/661416
In TripleO we use 'service', and not 'services'.
So we need to force the midonet & bigswitch configs to be 'service'.

Change-Id: If04a3f055ce9ebb1bdfeb20cbf82638fadcda71a
This commit is contained in:
Emilien Macchi 2019-05-28 10:12:51 -04:00
parent 4d6eeaee01
commit d8ebe0c502
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
View File

@ -81,6 +81,7 @@ resources:
neutron::agents::dhcp::interface_driver: 'neutron.agent.linux.interface.MidonetInterfaceDriver'
neutron::agents::dhcp::dhcp_driver: 'midonet.neutron.agent.midonet_driver.DhcpNoOpDriver'
neutron::plugins::midonet::midonet_api_port: 8081
neutron::plugins::midonet::keystone_tenant: service
neutron::params::midonet_server_package: 'python-networking-midonet'
# Make sure the l3 agent does not run

1
puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
View File

@ -59,6 +59,7 @@ resources:
neutron::plugins::ml2::bigswitch::restproxy::neutron_id: {get_input: restproxy_neutron_id}
neutron::plugins::ml2::bigswitch::restproxy::server_ssl: {get_input: restproxy_server_ssl}
neutron::plugins::ml2::bigswitch::restproxy::ssl_cert_directory: {get_input: restproxy_ssl_cert_directory}
neutron::plugins::ml2::bigswitch::restproxy::auth_tenant: service
NeutronBigswitchDeployment:
type: OS::Heat::StructuredDeployment