diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-30 22:04:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-30 22:04:37 +0000 |
| commit | 88381053c2785cce670bf91ebc00177992dc45bc (patch) | |
| tree | 2282914b3f8cf0caa4c80e6557f1484a95850f47 /puppet/extraconfig/pre_deploy/compute | |
| parent | 5f9cc7d434220ca3763de3bf33a7248954354d08 (diff) | |
| parent | 8eaa5f8e10a801be8fc45eeaaa479e7774d97997 (diff) | |
Merge "Re-Add bigswitch agent support"
Diffstat (limited to 'puppet/extraconfig/pre_deploy/compute')
| -rw-r--r-- | puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml | 9 |
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 |