From 8eaa5f8e10a801be8fc45eeaaa479e7774d97997 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 15 Mar 2017 09:55:05 -0600 Subject: Re-Add bigswitch agent support The agent configuration was lost in newton during the puppet-tripleo and THT role conversion. This change adds support for including the bigswitch agent service for composable roles. Change-Id: I46896389e48cdbe2864bf5b609a786f1c84ef908 Closes-Bug: #1673126 --- puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml') diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml index 533c0ee9..e3f4cce6 100644 --- a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml +++ b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml @@ -27,6 +27,15 @@ resources: mapped_data: neutron::agents::bigswitch::agent_enabled: {get_input: neutron_enable_bigswitch_agent} neutron::agents::bigswitch::lldp_enabled: {get_input: neutron_enable_bigswitch_lldp} + # NOTE(aschultz): required for the puppet module but we don't + # actually want them defined on the compute nodes so we're + # relying on the puppet module's handling of + # to just not set these but still accept that they were defined. + # This will should be fixed in puppet-neutron and removed here, + # but for backportability, we need to define something. + neutron::plugins::ml2::bigswitch::restproxy::servers: '' + neutron::plugins::ml2::bigswitch::restproxy::server_auth: '' + NeutronBigswitchDeployment: type: OS::Heat::StructuredDeployment -- cgit 1.2.3-korg