diff options
author | Dan Prince <dprince@redhat.com> | 2016-06-08 15:57:18 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2016-06-13 21:57:58 -0400 |
commit | cf04308ee598b2a6d791c9b4834a746b8b373713 (patch) | |
tree | d75a67a2f1ea45aa32ff101a12a23241325dc652 /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | dea033bca6997bff226391bf10c5afebcfd4dd18 (diff) |
Composable Neutron Plumgrid plugin
Partially-implements: blueprint composable-services-within-roles
Depends-On: I8536782d433f97a9b619e54a1eb1ea0edb8fdaf0
Change-Id: I3309997413998f1d90117e361d1578da3633e56c
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 81cdb102..7a31dd75 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -454,14 +454,6 @@ MYSQL_HOST=localhost\n", keystone_password => hiera('neutron::server::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 $enable_ceph { $ceph_pools = hiera('ceph_pools') |