diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-01 22:04:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-01 22:04:54 +0000 |
| commit | 10dce17a8a0a1c9718d40a3e158e7d34cc31ebfe (patch) | |
| tree | 5716408500dbb86f1116456ce6a3faeb2e723f35 | |
| parent | 5beb31ac37216bb0d97a255ae0a3e2fc5bf5e5d2 (diff) | |
| parent | ad4cc3e9ad9d16d4e21c9dded6dea8af254201f8 (diff) | |
Merge "Add ability to toggle swift's ceilometer transport_url SSL"
| -rw-r--r-- | puppet/services/swift-proxy.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index 62d227a2..31a4c178 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -57,6 +57,12 @@ parameters: default: 5672 description: Set rabbit subscriber port, change this if using SSL type: number + RabbitClientUseSSL: + default: false + description: > + Rabbit client subscriber parameter to specify + an SSL connection to the RabbitMQ host. + type: string conditions: @@ -91,6 +97,7 @@ outputs: swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]} swift::proxy::ceilometer::nonblocking_notify: true tripleo::profile::base::swift::proxy::rabbit_port: {get_param: RabbitClientPort} + tripleo::profile::base::swift::proxy::ceilometer_messaging_use_ssl: {get_param: RabbitClientUseSSL} tripleo::profile::base::swift::proxy::ceilometer_enabled: {get_param: SwiftCeilometerPipelineEnabled} tripleo.swift_proxy.firewall_rules: '122 swift proxy': |