diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-31 11:49:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-31 11:49:34 +0000 |
| commit | d7653b73a411d7b99a9cde36748b2e74faf700cb (patch) | |
| tree | bae6ac68c31338decb229f437448816f80e585f9 /puppet/services | |
| parent | e713171e1e1c56bd8fadad4cf8dffbc8f5c3a66b (diff) | |
| parent | eb114773ace4179e9e3ed74ca40cd5acbef11d38 (diff) | |
Merge "Enable internal TLS for aodh"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/aodh-api.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml index da043c80..48cc4af6 100644 --- a/puppet/services/aodh-api.yaml +++ b/puppet/services/aodh-api.yaml @@ -26,6 +26,9 @@ parameters: description: Combination alarms are deprecated in Newton, hence disabled by default. To enable, set this parameter to true. type: boolean + EnableInternalTLS: + type: boolean + default: false resources: AodhBase: @@ -41,6 +44,7 @@ resources: ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} + EnableInternalTLS: {get_param: EnableInternalTLS} outputs: role_data: @@ -52,7 +56,7 @@ outputs: map_merge: - get_attr: [AodhBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings] - - aodh::wsgi::apache::ssl: false + - aodh::wsgi::apache::ssl: {get_param: EnableInternalTLS} aodh::wsgi::apache::servername: str_replace: template: @@ -66,13 +70,18 @@ outputs: dport: - 8042 - 13042 + aodh::api::host: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]} # NOTE: bind IP is found in Heat replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api): # internal_api -> IP # internal_api_uri -> [IP] # internal_api_subnet - > IP/CIDR - aodh::api::host: {get_param: [ServiceNetMap, AodhApiNetwork]} aodh::wsgi::apache::bind_host: {get_param: [ServiceNetMap, AodhApiNetwork]} tripleo::profile::base::aodh::api::enable_combination_alarms: {get_param: EnableCombinationAlarms} service_config_settings: |