diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-04-08 08:42:02 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-05-10 21:52:01 -0400 |
| commit | 27f7d220bd5a9d0a1deebe16dd1d6a3dee11af82 (patch) | |
| tree | 45573a43ddba13e157ec4e89a834f8840fa3f9ec /environments | |
| parent | d76f70edcd3bbf0308071638cb4ee8eb2f70503a (diff) | |
composable neutron dhcp service
Adds new puppet and puppet pacemaker specific services for
the Neutron DHCP agent.
Depends-On: Ibbfd79421f871e41f870745a593cca65e8c0e58a
Partially-implements: blueprint composable-services-within-roles
Change-Id: Ia61295943e67efe354a51a26fe4540f288ff6ede
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 |