aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-04-08 17:09:30 -0400
committerDan Prince <dprince@redhat.com>2016-05-18 08:26:09 -0400
commit168bc2f6ff7310db6dc4cf957fdbb121419a3fcf (patch)
tree8f5c3e0bbb7f333662159cdb92fea8711c10904a /puppet/manifests/overcloud_controller.pp
parent59e2f29fd1a43bee6a6d59d655c6ba579597f67e (diff)
composable neutron metadata service
Adds new puppet and puppet pacemaker specific services for the Neutron Metadata agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I25f026507e78f18594599b3621613a54f246545d
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 79e08269..7ea92143 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::metadata
# If the value of core plugin is set to 'midonet',
# skip all the ML2 configuration