From bf9b176e3512f652cdb6fc091a58a4f845bc9619 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 5 Dec 2014 10:00:13 -0500 Subject: Add missing Rabbit params to without-mergepy This patch adds the missing RabbitClientUseSSL and RabbitClientPort to overcloud-without-mergepy.yaml. These parameters were adding to overcloud-source.yaml in I7b7613cb60b9095ba5665c335c496fea4514391a. Due to the concurrent review window they never made it into the new overcloud-without-mergepy.yaml implementation. Change-Id: I182671b84d0a21d7018eb136003968f101384716 --- overcloud-without-mergepy.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'overcloud-without-mergepy.yaml') diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 602e7958..f807cdbd 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -145,6 +145,16 @@ parameters: description: The password for RabbitMQ type: string hidden: true + RabbitClientUseSSL: + default: false + description: > + Rabbit client subscriber parameter to specify + an SSL connection to the RabbitMQ host. + type: string + RabbitClientPort: + default: 5672 + description: Set rabbit subscriber port, change this if using SSL + type: number SnmpdReadonlyUserName: default: ro_snmp_user description: The user name for SNMPd with readonly rights running on all Overcloud nodes @@ -463,6 +473,8 @@ resources: RabbitUserName: {get_param: RabbitUserName} RabbitPassword: {get_param: RabbitPassword} RabbitCookie: {get_attr: [RabbitCookie, value]} + RabbitClientUseSSL: {get_param: RabbitClientUseSSL} + RabbitClientPort: {get_param: RabbitClientPort} SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName} SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword} SSLCertificate: {get_param: SSLCertificate} -- cgit 1.2.3-korg