openstack
/
puppet-tripleo
Code Issues Proposed changes

Align hiera keys with service names 

These hiera keys aren't aligned with the service names, which
will be required for composable generation of the ip lists
per service.

Change-Id: I423b544df174254ac511b906b0c570e701678022
Depends-On: I7febf28bf409e25e8e5961ab551b6d56bb11e0c6
Partially-Implements: blueprint custom-roles
This commit is contained in:
Steven Hardy 2016-08-10 17:34:04 +01:00
parent b2c8033766
commit 0b9e06561b
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/profile/base/ceilometer/collector.pp
View File

@ -44,12 +44,12 @@ class tripleo::profile::base::ceilometer::collector (
# without the brackets as 'members' argument for the 'mongodb_replset'
# resource.
if str2bool(hiera('mongodb::server::ipv6', false)) {
$mongo_node_ips_with_port_prefixed = prefix(hiera('mongo_node_ips'), '[')
$mongo_node_ips_with_port_prefixed = prefix(hiera('mongodb_node_ips'), '[')
$mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017')
$mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017')
$mongo_node_ips_with_port_nobr = suffix(hiera('mongodb_node_ips'), ':27017')
} else {
$mongo_node_ips_with_port = suffix(hiera('mongo_node_ips'), ':27017')
$mongo_node_ips_with_port_nobr = suffix(hiera('mongo_node_ips'), ':27017')
$mongo_node_ips_with_port = suffix(hiera('mongodb_node_ips'), ':27017')
$mongo_node_ips_with_port_nobr = suffix(hiera('mongodb_node_ips'), ':27017')
}
$mongo_node_string = join($mongo_node_ips_with_port, ',')

2
manifests/profile/base/database/mongodbcommon.pp
View File

@ -27,7 +27,7 @@
#
class tripleo::profile::base::database::mongodbcommon (
$mongodb_ipv6_enabled = false,
$mongodb_node_ips = hiera('mongo_node_ips'),
$mongodb_node_ips = hiera('mongodb_node_ips'),
) {
$port = '27017'

4
manifests/profile/base/horizon.pp
View File

@ -38,9 +38,9 @@ class tripleo::profile::base::horizon (
$neutron_options = {'profile_support' => $_profile_support }
$memcached_ipv6 = hiera('memcached_ipv6', false)
if $memcached_ipv6 {
$horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]')
$horizon_memcached_servers = hiera('memcached_node_ips_v6', '[::1]')
} else {
$horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1')
$horizon_memcached_servers = hiera('memcached_node_ips', '127.0.0.1')
}
class { '::horizon':
cache_server_ip => $horizon_memcached_servers,

4
manifests/profile/base/nova.pp
View File

@ -52,9 +52,9 @@ class tripleo::profile::base::nova (
}
if hiera('nova::use_ipv6', false) {
$memcache_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
$memcache_servers = suffix(hiera('memcached_node_ips_v6'), ':11211')
} else {
$memcache_servers = suffix(hiera('memcache_node_ips'), ':11211')
$memcache_servers = suffix(hiera('memcached_node_ips'), ':11211')
}
if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) {

4
manifests/profile/base/rabbitmq.pp
View File

@ -36,7 +36,7 @@
#
# [*nodes*]
# (Optional) Array of host(s) for RabbitMQ nodes.
# Defaults to hiera('rabbit_node_ips', []).
# Defaults to hiera('rabbitmq_node_ips', []).
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -48,7 +48,7 @@ class tripleo::profile::base::rabbitmq (
$environment = hiera('rabbitmq_environment'),
$ipv6 = str2bool(hiera('rabbit_ipv6', false)),
$kernel_variables = hiera('rabbitmq_kernel_variables'),
$nodes = hiera('rabbit_node_ips', []),
$nodes = hiera('rabbitmq_node_ips', []),
$step = hiera('step'),
) {
# IPv6 environment, necessary for RabbitMQ.