From e8e7c42c0198f9796d3e88cd4ab518fdd61b2e1a Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 6 Jul 2016 14:03:37 -0400 Subject: Composable Nuage Compute Plugin Adds a new neutron compute plugin used to help configure nuage for use on compute nodes. Change-Id: I732ec85d1f0605e562dacb02624a355e425d911a Depends-On: Ic842ebdc183918ec9a24f83ae39adfba27bc799c --- puppet/manifests/overcloud_compute.pp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'puppet/manifests') 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') -- cgit 1.2.3-korg