openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Support networking-ansible-ml2 coordination"

This commit is contained in:
Zuul 2019-10-01 03:41:50 +00:00 committed by Gerrit Code Review
parent c6b992da66 a77d632492
commit fb56cd0f84
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/profile/base/neutron/plugins/ml2/networking_ansible.pp
View File

@ -18,6 +18,18 @@
#
# === Parameters
#
# [*neutron_redis_password*]
# (Required) Password for the neutron redis user for the coordination url
# Defaults to hiera('neutron_redis_password'),
#
# [*redis_vip*]
# (Required) Redis ip address for the coordination url
# Defaults to hiera('redis_vip'),
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
@ -25,12 +37,23 @@
#
class tripleo::profile::base::neutron::plugins::ml2::networking_ansible(
$step = Integer(hiera('step'))
$neutron_redis_password = hiera('neutron_redis_password'),
$redis_vip = hiera('redis_vip'),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step'))
) {
include ::tripleo::profile::base::neutron
if $enable_internal_tls {
$tls_query_param = '?ssl=true'
} else {
$tls_query_param = ''
}
if $step >= 4 {
include ::neutron::plugins::ml2::networking_ansible
class { '::neutron::plugins::ml2::networking_ansible':
coordination_url => join(['redis://:', $neutron_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param])
}
}
}