diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opencontrail.yaml | 2 | ||||
| -rwxr-xr-x | environments/neutron-plumgrid.yaml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index c9bd98bb..c9d918f9 100644 --- a/environments/neutron-opencontrail.yaml +++ b/environments/neutron-opencontrail.yaml @@ -3,11 +3,11 @@ resource_registry: OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml + OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None parameter_defaults: NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin - OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None NeutronEnableL3Agent: false NeutronEnableMetadataAgent: false NeutronEnableOVSAgent: false diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml index 5a244e5b..8f17b8b5 100755 --- a/environments/neutron-plumgrid.yaml +++ b/environments/neutron-plumgrid.yaml @@ -2,6 +2,8 @@ # extensions, configured via puppet resource_registry: OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-plumgrid.yaml + # PLUMgrid doesn't require dhcp + OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None parameter_defaults: NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2 @@ -22,8 +24,7 @@ parameter_defaults: #PLUMgridNeutronPluginVersion: present #PLUMgridPlumlibVersion: present - # PLUMgrid doesn't require dhcp, l3, ovs and metadata agents - OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None + # PLUMgrid doesn't require l3, ovs and metadata agents NeutronEnableL3Agent: false NeutronEnableMetadataAgent: false NeutronEnableOVSAgent: false |