diff options
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-opencontrail.yaml | 2 | ||||
| -rwxr-xr-x | environments/neutron-plumgrid.yaml | 2 | ||||
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index 4704dbc8..c9bd98bb 100644 --- a/environments/neutron-opencontrail.yaml +++ b/environments/neutron-opencontrail.yaml @@ -7,7 +7,7 @@ resource_registry: parameter_defaults: NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin - NeutronEnableDHCPAgent: false + 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 b8d66015..5a244e5b 100755 --- a/environments/neutron-plumgrid.yaml +++ b/environments/neutron-plumgrid.yaml @@ -23,7 +23,7 @@ parameter_defaults: #PLUMgridPlumlibVersion: present # PLUMgrid doesn't require dhcp, l3, ovs and metadata agents - NeutronEnableDHCPAgent: false + OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None NeutronEnableL3Agent: false NeutronEnableMetadataAgent: false NeutronEnableOVSAgent: false diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 2e6e5ec9..48e93a0c 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -12,3 +12,4 @@ resource_registry: OS::TripleO::Services::Keystone: ../puppet/services/pacemaker/keystone.yaml OS::TripleO::Services::GlanceApi: ../puppet/services/pacemaker/glance-api.yaml OS::TripleO::Services::GlanceRegistry: ../puppet/services/pacemaker/glance-registry.yaml + OS::TripleO::Services::NeutronDhcpAgent: ../puppet/services/pacemaker/neutron-dhcp.yaml |