diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-12 17:38:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-12 17:38:54 +0000 |
| commit | e9df98a8fb4105c9d039b071e951a3aabd8e9025 (patch) | |
| tree | 9146fb2f3a2744a64bed783265b31be4b80e9cdb /puppet/manifests/overcloud_compute.pp | |
| parent | 01e510b754a9bf37193af73e7f38770dd661683c (diff) | |
| parent | e8e7c42c0198f9796d3e88cd4ab518fdd61b2e1a (diff) | |
Merge "Composable Nuage Compute Plugin"
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 9bebec67..ddb1c358 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -40,23 +40,10 @@ if hiera('step') >= 4 { } } - # If the value of core plugin is set to 'nuage', - # include nuage agent, # If the value of core plugin is set to 'midonet', # include midonet agent, # else use the default value of 'ml2' - if hiera('neutron::core_plugin') == 'neutron.plugins.nuage.plugin.NuagePlugin' { - include ::nuage::vrs - include ::nova::compute::neutron - - class { '::nuage::metadataagent': - nova_os_tenant_name => hiera('nova::api::admin_tenant_name'), - nova_os_password => hiera('nova_password'), - nova_metadata_ip => hiera('nova_metadata_node_ips'), - nova_auth_ip => hiera('keystone_public_api_virtual_ip'), - } - } - elsif hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { + if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' { # TODO(devvesa) provide non-controller ips for these services $zookeeper_node_ips = hiera('neutron_api_node_ips') |