aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--controller.yaml12
-rw-r--r--overcloud-without-mergepy.yaml12
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}