aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2017-03-15 09:55:05 -0600
committerSarath Kumar Sankaran Kutty <sarath.kutty@bigswitch.com>2017-03-31 18:01:10 +0000
commitf9d2ce123bf0fcebb50a97fce4db7412d0d70e38 (patch)
tree5aedbf49e3c23ee780eba546f656761324115395 /puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
parent51813d8b3407cb31d8d2c501c4d8b60f0b06bfe9 (diff)
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 (cherry picked from commit 8eaa5f8e10a801be8fc45eeaaa479e7774d97997)
Diffstat (limited to 'puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml')
-rw-r--r--puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml9
1 files changed, 9 insertions, 0 deletions
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 <SERVICE DEFAULT>
+ # 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: '<SERVICE DEFAULT>'
+ neutron::plugins::ml2::bigswitch::restproxy::server_auth: '<SERVICE DEFAULT>'
+
NeutronBigswitchDeployment:
type: OS::Heat::StructuredDeployment