diff options
author | Dan Prince <dprince@redhat.com> | 2014-12-05 10:00:13 -0500 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2014-12-05 20:48:28 -0500 |
commit | bf9b176e3512f652cdb6fc091a58a4f845bc9619 (patch) | |
tree | f510f4929b3fc21e61c7fc0ffc56e8eb8c862d7a | |
parent | fc0158c38c41f7142c8bdb2e4ec154012ad88e53 (diff) |
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
-rw-r--r-- | controller.yaml | 12 | ||||
-rw-r--r-- | overcloud-without-mergepy.yaml | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index 0c76f496..b32996c6 100644 --- a/controller.yaml +++ b/controller.yaml @@ -274,6 +274,16 @@ parameters: default: guest description: The username for RabbitMQ type: string + 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 @@ -482,6 +492,8 @@ resources: username: {get_param: RabbitUserName} password: {get_param: RabbitPassword} cookie: {get_param: RabbitCookie} + rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} + rabbit_port: {get_param: RabbitClientPort} ntp: servers: - {server: {get_param: NtpServer}, fudge: "stratum 0"} 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} |