diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 14:31:40 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 14:31:40 +0000 |
commit | 91c5c470890f1716e70ca50a72ff7431e6fac08a (patch) | |
tree | cc9f38409309a3603d03c54331833291837ee8ab /puppet/manifests/overcloud_controller.pp | |
parent | 84f7ec83b82d719609b09117d306706cebef33e9 (diff) | |
parent | 6091f0b957287fb47f70eeb527c47fe80c307a31 (diff) |
Merge "Add Rabbit IPv6 only support"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 1d1dc5c5..ecab5b5a 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -117,13 +117,23 @@ if hiera('step') >= 2 { $rabbit_nodes = hiera('rabbit_node_ips') if count($rabbit_nodes) > 1 { + + $rabbit_ipv6 = str2bool(hiera('rabbit_ipv6', false)) + if $rabbit_ipv6 { + $rabbit_env = merge(hiera('rabbitmq_environment'), { + 'RABBITMQ_SERVER_START_ARGS' => '"-proto_dist inet6_tcp"' + }) + } else { + $rabbit_env = hiera('rabbitmq_environment') + } + class { '::rabbitmq': config_cluster => true, cluster_nodes => $rabbit_nodes, tcp_keepalive => false, config_kernel_variables => hiera('rabbitmq_kernel_variables'), config_variables => hiera('rabbitmq_config_variables'), - environment_variables => hiera('rabbitmq_environment'), + environment_variables => $rabbit_env, } rabbitmq_policy { 'ha-all@/': pattern => '^(?!amq\.).*', |