diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-04-08 14:16:34 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-05-18 08:25:00 -0400 |
| commit | 59e2f29fd1a43bee6a6d59d655c6ba579597f67e (patch) | |
| tree | 74fc4b29c003b4abf11ec154560f8edef7dc0e0f /puppet/manifests/overcloud_controller.pp | |
| parent | d6574fa32a0954aea02684984d9a93c444ec34f0 (diff) | |
composable neutron l3 service
Adds new puppet and puppet pacemaker specific services for
the Neutron L3 agent.
Partially-implements: blueprint composable-services-within-roles
Change-Id: I0316043efe357a41ef3b4088a55d98dbb6d25963
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 34ca845c..79e08269 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -305,7 +305,6 @@ if hiera('step') >= 4 { metadata_proxy_shared_secret => hiera('nova::api::neutron_metadata_proxy_shared_secret'), } } else { - include ::neutron::agents::l3 include ::neutron::agents::metadata # If the value of core plugin is set to 'midonet', @@ -349,13 +348,9 @@ if hiera('step') >= 4 { include ::neutron::plugins::ml2::bigswitch::restproxy include ::neutron::agents::bigswitch } - neutron_l3_agent_config { - 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false); - } Service['neutron-server'] -> Service['neutron-ovs-agent-service'] } - Service['neutron-server'] -> Service['neutron-l3'] Service['neutron-server'] -> Service['neutron-metadata'] } |