openstack/tripleo-heat-templates
Code Issues Proposed changes

Composable Neutron Plumgrid plugin

Browse Source 
Partially-implements: blueprint composable-services-within-roles

Depends-On: I8536782d433f97a9b619e54a1eb1ea0edb8fdaf0
Change-Id: I3309997413998f1d90117e361d1578da3633e56c
This commit is contained in:
Dan Prince
2016-06-08 15:57:18 -04:00
parent dea033bca6
commit cf04308ee5
7 changed files with 81 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
puppet/manifests/overcloud_controller.pp
View File

@@ -215,21 +215,13 @@ if hiera('step') >= 4 {
}
# If the value of core plugin is set to 'nuage' or'opencontrail' or 'plumgrid',
# include nuage or opencontrail or plumgrid core plugins
# If the value of core plugin is set to 'nuage' or'opencontrail'
# include nuage or opencontrail core plugins
# else use the default value of 'ml2'
if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' {
include ::neutron::plugins::nuage
} elsif hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
include ::neutron::plugins::opencontrail
}
elsif 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'),
}
} else {
# If the value of core plugin is set to 'midonet',

8
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@@ -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')