From 9223f5d2613102505a02334300134190527f1d9f Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 17 May 2016 17:14:58 -0400 Subject: Move dhcp agent maps to OS::Heat::None to resource_registry Change Id Ia61295943e67efe354a51a26fe4540f288ff6ede added support for composable Neutron dhcp agent services. However in the sample environments for OpenContrail and Plumgrid where dhcp agent is disabled, the mapping for OS::Heat::None was under parameter_defaults instead of resource_registry. Change-Id: I0aedbbc3720783d4208d524cd28c7eed4fc5d1d7 --- environments/neutron-opencontrail.yaml | 2 +- environments/neutron-plumgrid.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'environments') 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 -- cgit 1.2.3-korg