summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-29 19:19:41 +0000
committerGerrit Code Review <review@openstack.org>2016-03-29 19:19:41 +0000
commite47ac07d4fdd61bae3789d39c12d06050e37dfd6 (patch)
tree6d4c756a4808be23bf0a729fd0e5f1e6fce753e6 /puppet/manifests/overcloud_controller_pacemaker.pp
parent7d704fbd074cdeb2b381aab353ee1deaeb9ae736 (diff)
parentee2c9ea45d705ad50fff991318342b06a8bbc721 (diff)
Merge "PLUMgrid Neutron integration"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index b271114f..fd12c342 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -792,6 +792,14 @@ if hiera('step') >= 4 {
keystone_password => hiera('neutron::server::auth_password')
}
}
+ if hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' {
+ class { '::neutron::plugins::plumgrid' :
+ connection => hiera('neutron::server::database_connection'),
+ controller_priv_host => hiera('keystone_admin_api_vip'),
+ admin_password => hiera('admin_password'),
+ metadata_proxy_shared_secret => hiera('nova::api::neutron_metadata_proxy_shared_secret'),
+ }
+ }
if hiera('neutron::enable_dhcp_agent',true) {
class { '::neutron::agents::dhcp' :
manage_service => false,