X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-ml2-bigswitch.yaml;h=c0ba906ec2bd0b7fbbf42ecf85af7a8373c5ea9c;hb=0b7c9a13ef977d50939a9a697c370d2ec26ed4b3;hp=69c913265e3d96186e420f34e75911f6654fbe58;hpb=6d0cec55ce50a54ede405c465f26fe87bb68af4e;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml
index 69c91326..c0ba906e 100644
--- a/environments/neutron-ml2-bigswitch.yaml
+++ b/environments/neutron-ml2-bigswitch.yaml
@@ -2,11 +2,17 @@
 # extensions, configured via puppet
 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: openvswitch,bsn_ml2
+  NeutronServicePlugins: bsn_l3,bsn_service_plugin
 
   # Optional:
   # NeutronBigswitchRestproxyAutoSyncOnFailure:
@@ -14,4 +20,12 @@ parameter_defaults:
   # NeutronBigswitchRestproxyNeutronId:
   # NeutronBigswitchRestproxyServerSsl:
   # NeutronBigswitchRestproxySslCertDirectory:
+  # 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