From 21eed9350afeeb56210923a1e9aa68d7eb8fc7e6 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 18 Mar 2015 14:57:56 -0400 Subject: Ensure all Rabbit params are propagated to interested nodes. Change-Id: I1bb8ee15d361638d77c5df7f8c03561c34f4c88f --- puppet/cinder-storage-puppet.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'puppet/cinder-storage-puppet.yaml') diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index 2f7a04c8..104130b3 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -76,6 +76,16 @@ parameters: RabbitUserName: default: '' 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 @@ -128,6 +138,8 @@ resources: host: {get_param: VirtualIP} rabbit_username: {get_param: RabbitUserName} rabbit_password: {get_param: RabbitPassword} + rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} + rabbit_client_port: {get_param: RabbitClientPort} ntp_servers: str_replace: template: '["server"]' @@ -162,6 +174,8 @@ resources: cinder::rabbit_hosts: {get_input: rabbit_hosts} cinder::rabbit_userid: {get_input: rabbit_username} cinder::rabbit_password: {get_input: rabbit_password} + cinder::rabbit_use_ssl: {get_input: rabbit_client_use_ssl} + cinder::rabbit_port: {get_input: rabbit_client_port} cinder_enable_iscsi_backend: {get_input: cinder_enable_iscsi_backend} ntp::servers: {get_input: ntp_servers} enable_package_install: {get_input: enable_package_install} -- cgit 1.2.3-korg