diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-03 18:36:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-03 18:36:58 +0000 |
| commit | 918a6fcc7c0ff3ee4eb7e6f119c776ac653f2607 (patch) | |
| tree | 5250552c56c4d4f20ef75ce2cb82e8de00b8cad6 /environments/neutron-ml2-bigswitch.yaml | |
| parent | d7055059a8da022b6651227c15bca4f2667e9bf4 (diff) | |
| parent | f9d2ce123bf0fcebb50a97fce4db7412d0d70e38 (diff) | |
Merge "Re-Add bigswitch agent support" into stable/ocata
Diffstat (limited to 'environments/neutron-ml2-bigswitch.yaml')
| -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 |