diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-19 08:54:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-19 08:54:27 +0000 |
| commit | b8a4e40cf2281036d4fb1f8db48ce16625b2edac (patch) | |
| tree | f7f4345c6037d0b5020229b134d356e62ee2dcb0 /puppet/services | |
| parent | 3f2242d05ef7e46f06639c4d7452f26d15f3af2f (diff) | |
| parent | de923539c81979380ba0b94b757c09e8bba9d158 (diff) | |
Merge "Set rabbitmq's port and IP via the config file and not the env file"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/rabbitmq.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index b77e0a91..08f3f6bc 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -73,6 +73,8 @@ outputs: rabbitmq::repos_ensure: false rabbitmq::tcp_keepalive: true rabbitmq_environment: + NODE_PORT: '' + NODE_IP_ADDRESS: '' RABBITMQ_NODENAME: "rabbit@%{::hostname}" RABBITMQ_SERVER_ERL_ARGS: '"+K true +P 1048576 -kernel inet_default_connect_options [{nodelay,true},{raw,6,18,<<5000:64/native>>}] -kernel inet_default_listen_options [{raw,6,18,<<5000:64/native>>}]"' rabbitmq_kernel_variables: @@ -95,7 +97,7 @@ outputs: # internal_api -> IP # internal_api_uri -> [IP] # internal_api_subnet - > IP/CIDR - rabbitmq::node_ip_address: {get_param: [ServiceNetMap, RabbitmqNetwork]} + rabbitmq::interface: {get_param: [ServiceNetMap, RabbitmqNetwork]} rabbitmq::nr_ha_queues: {get_param: RabbitHAQueues} step_config: | include ::tripleo::profile::base::rabbitmq |