diff options
| author |   Alex Schultz <aschultz@redhat.com> | 2017-03-15 09:55:05 -0600 |
|---|---|---|
| committer |   Sarath Kumar Sankaran Kutty <sarath.kutty@bigswitch.com> | 2017-03-31 18:01:10 +0000 |
| commit | f9d2ce123bf0fcebb50a97fce4db7412d0d70e38 (patch) | |
| tree | 5aedbf49e3c23ee780eba546f656761324115395 /environments | |
| parent | 51813d8b3407cb31d8d2c501c4d8b60f0b06bfe9 (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 'environments')
| -rw-r--r-- | environments/neutron-ml2-bigswitch.yaml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml index 750d3c4e..8a4a144c 100644 --- a/environments/neutron-ml2-bigswitch.yaml +++ b/environments/neutron-ml2-bigswitch.yaml @@ -3,12 +3,17 @@ resource_registry: OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml + OS::TripleO::NeutronBigswitchAgent: ../puppet/services/neutron-bigswitch-agent.yaml + OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None + OS::TripleO::Services::NeutronL3Agent: OS::Heat::None parameter_defaults: # Required to fill in: NeutronBigswitchRestproxyServers: NeutronBigswitchRestproxyServerAuth: - NeutronMechanismDrivers: bsn_ml2 + NeutronMechanismDrivers: openvswitch,bsn_ml2 + NeutronServicePlugins: bsn_l3,bsn_service_plugin + KeystoneNotificationDriver: messaging # Optional: # NeutronBigswitchRestproxyAutoSyncOnFailure: @@ -19,3 +24,9 @@ parameter_defaults: # NeutronBigswitchAgentEnabled: # NeutronBigswitchLLDPEnabled: + ControllerExtraConfig: + neutron::agents::l3::enabled: false + neutron::agents::dhcp::enable_force_metadata: true + neutron::agents::dhcp::enable_isolated_metadata: true + neutron::agents::dhcp::enable_metadata_network: false + neutron::server::l3_ha: false |