openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Removing conditions to enable Nuage VRS and Metadata Agent"

This commit is contained in:
Zuul 2018-04-26 09:58:54 +00:00 committed by Gerrit Code Review
parent 203083e97d c31a624c66
commit 6b9f8a5f26
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/profile/base/neutron/agents/nuage.pp
View File

@ -34,14 +34,6 @@
# (Optional) Nova tenant name
# Defaults to hiera('nova_os_tenant_name')
#
# [*enable_vrs*]
# (Optional) Enable VRS or not
# Defaults to true
#
# [*enable_metadata*]
# (Optional) Enable Nuage Metadata or not
# Defaults to true
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
@ -51,22 +43,16 @@ class tripleo::profile::base::neutron::agents::nuage (
$nova_metadata_ip = hiera('nova_metadata_node_ips', ''),
$nova_os_password = hiera('nova_password', ''),
$nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
$enable_vrs = true,
$enable_metadata = true,
$step = Integer(hiera('step')),
) {
if $step >= 4 {
if $enable_vrs {
include ::nuage::vrs
}
include ::nuage::vrs
if $enable_metadata {
class { '::nuage::metadataagent':
nova_os_tenant_name => $nova_os_tenant_name,
nova_os_password => $nova_os_password,
nova_metadata_ip => $nova_metadata_ip,
nova_auth_ip => $nova_auth_ip,
}
class { '::nuage::metadataagent':
nova_os_tenant_name => $nova_os_tenant_name,
nova_os_password => $nova_os_password,
nova_metadata_ip => $nova_metadata_ip,
nova_auth_ip => $nova_auth_ip,
}
}
}