From 385f75b9c4ff36614985b7dfe03d51c90a842a8a Mon Sep 17 00:00:00 2001 From: Javier Pena Date: Mon, 4 Sep 2017 13:06:40 +0200 Subject: [PATCH] Ensure rabbitmq ports are integer The latest puppet-rabbitmq commits require the "port" parameter to be an integer [1]. Even though we are still pinning to a previous version without this requirement, we should get ready for the future bump. [1] - https://github.com/voxpupuli/puppet-rabbitmq/blob/5cd873e0656322e169c79eef0c23c10f144b0660/manifests/init.pp#L45 Change-Id: I830e59595a4bcdc60a5cec29d5b8672b7cd8e082 --- packstack/puppet/modules/packstack/manifests/amqp.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/amqp.pp b/packstack/puppet/modules/packstack/manifests/amqp.pp index f8987b7bb..90429af58 100644 --- a/packstack/puppet/modules/packstack/manifests/amqp.pp +++ b/packstack/puppet/modules/packstack/manifests/amqp.pp @@ -17,7 +17,7 @@ define enable_rabbitmq { class { '::rabbitmq': port => undef, - ssl_port => hiera('CONFIG_AMQP_CLIENTS_PORT'), + ssl_port => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'), ssl_only => true, ssl => true, ssl_cacert => $kombu_ssl_ca_certs, @@ -37,7 +37,7 @@ define enable_rabbitmq { } } else { class { '::rabbitmq': - port => hiera('CONFIG_AMQP_CLIENTS_PORT'), + port => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'), ssl => false, default_user => hiera('CONFIG_AMQP_AUTH_USER'), default_pass => hiera('CONFIG_AMQP_AUTH_PASSWORD'),