274156e5ba
This patch changes the rabbit_hosts config generation to work properly with IPv6 addresses. Closes-Bug: #1639881 Change-Id: I07cd983880a4a75a051e081dcb96134cb5c6f5e8
46 lines
1.4 KiB
Puppet
46 lines
1.4 KiB
Puppet
# Copyright 2016 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
# == Class: tripleo::profile::base::neutron
|
|
#
|
|
# Neutron server profile for tripleo
|
|
#
|
|
# === Parameters
|
|
#
|
|
# [*step*]
|
|
# (Optional) The current step of the deployment
|
|
# Defaults to hiera('step')
|
|
#
|
|
# [*rabbit_hosts*]
|
|
# list of the rabbbit host IPs
|
|
# Defaults to hiera('rabbitmq_node_ips')
|
|
#
|
|
# [*rabbit_port*]
|
|
# IP port for rabbitmq service
|
|
# Defaults to hiera('neutron::rabbit_port', 5672
|
|
|
|
class tripleo::profile::base::neutron (
|
|
$step = hiera('step'),
|
|
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
|
|
$rabbit_port = hiera('neutron::rabbit_port', 5672),
|
|
) {
|
|
if $step >= 3 {
|
|
$rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
|
|
class { '::neutron' :
|
|
rabbit_hosts => $rabbit_endpoints,
|
|
}
|
|
include ::neutron::config
|
|
}
|
|
}
|