diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-31 09:43:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-31 09:43:25 +0000 |
| commit | e71604beafb2a9cdbf43867acb230ddf359e8f81 (patch) | |
| tree | ebad33b4b94c8d5dea2166c1a98779e98c664768 /puppet/services | |
| parent | 9e2e558a5f0e6507a163c32f1351099670aee2bb (diff) | |
| parent | 660dbd5afbe473b78fd2f75253501fbd91f755b8 (diff) | |
Merge "Enable internal TLS for ceilometer"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/ceilometer-api.yaml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml index 27c32bfd..97b255a9 100644 --- a/puppet/services/ceilometer-api.yaml +++ b/puppet/services/ceilometer-api.yaml @@ -26,7 +26,9 @@ parameters: default: tag: openstack.ceilometer.api path: /var/log/ceilometer/api.log - + EnableInternalTLS: + type: boolean + default: false resources: CeilometerServiceBase: @@ -42,6 +44,7 @@ resources: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} + EnableInternalTLS: {get_param: EnableInternalTLS} outputs: role_data: @@ -69,9 +72,14 @@ outputs: # internal_api_subnet - > IP/CIDR - ceilometer::api::service_name: 'httpd' ceilometer::api::enable_proxy_headers_parsing: true - ceilometer::api::host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} + ceilometer::api::host: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} - ceilometer::wsgi::apache::ssl: false + ceilometer::wsgi::apache::ssl: {get_param: EnableInternalTLS} ceilometer::wsgi::apache::servername: str_replace: template: |