aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-03 14:32:58 +0000
committerGerrit Code Review <review@openstack.org>2016-05-03 14:32:59 +0000
commit10dae1c697aab4b896154000687c3f40adba1e0e (patch)
tree6f8a722ccb2c927a8742267d87b2ac5812970ccc /puppet
parentcab8f750a91238a1e3227d40c81e4c40188a621d (diff)
parent7e0836283525f914e07d0939eca9df811133988f (diff)
Merge "Wire missing RabbitClientPort into Glance API role"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/glance-api.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index a1ab1a20..3e8784b7 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -47,6 +47,10 @@ parameters:
default: guest
description: The username for RabbitMQ
type: string
+ RabbitClientPort:
+ default: 5672
+ description: Set rabbit subscriber port, change this if using SSL
+ type: number
RabbitClientUseSSL:
default: false
description: >
@@ -87,6 +91,7 @@ outputs:
glance_backend: {get_param: GlanceBackend}
glance::db::mysql::password: {get_param: GlancePassword}
glance::notify::rabbitmq::rabbit_userid: {get_param: RabbitUserName}
+ glance::notify::rabbitmq::rabbit_port: {get_param: RabbitClientPort}
glance::notify::rabbitmq::rabbit_password: {get_param: RabbitPassword}
glance::notify::rabbitmq::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
step_config: |