diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-29 19:19:41 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-29 19:19:41 +0000 |
commit | e47ac07d4fdd61bae3789d39c12d06050e37dfd6 (patch) | |
tree | 6d4c756a4808be23bf0a729fd0e5f1e6fce753e6 /puppet/manifests/overcloud_controller.pp | |
parent | 7d704fbd074cdeb2b381aab353ee1deaeb9ae736 (diff) | |
parent | ee2c9ea45d705ad50fff991318342b06a8bbc721 (diff) |
Merge "PLUMgrid Neutron integration"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index ff2264cf..c6667ae6 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -344,13 +344,21 @@ if hiera('step') >= 4 { include ::neutron::server include ::neutron::server::notifications - # If the value of core plugin is set to 'nuage' or 'opencontrail', - # include nuage or opencontrail core plugins, and it does not - # need the l3, dhcp and metadata agents + # If the value of core plugin is set to 'nuage' or'opencontrail' or 'plumgrid', + # include nuage or opencontrail or plumgrid 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 { include ::neutron::agents::l3 include ::neutron::agents::dhcp |