3a7baa8fa6
Since https://review.openstack.org/#/c/514707/ added the net_ip_map to hieradata, we can look up the per-network bind IPs via hiera interpolation instead of heat map_replace. In some cases the ServiceNetMap lookup is used for other things, but anywhere we make use of the "magic" translation via NetIpMap is changed the same way. This will enable more of the configuration data to be exposed per role vs per node in a future patch (to simplify our ansible workflow). Co-authored-by: Bogdan Dobrelya <bdobreli@redhat.com> Change-Id: Ie3da9fedbfce87e85f74d8780e7ad1ceadda79c8
130 lines
4.5 KiB
YAML
130 lines
4.5 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack Aodh API service configured with Puppet
|
|
|
|
parameters:
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
GnocchiExternalProject:
|
|
default: 'service'
|
|
description: Project name of resources creator in Gnocchi.
|
|
type: string
|
|
MonitoringSubscriptionAodhApi:
|
|
default: 'overcloud-ceilometer-aodh-api'
|
|
type: string
|
|
EnableInternalTLS:
|
|
type: boolean
|
|
default: false
|
|
AodhApiPolicies:
|
|
description: |
|
|
A hash of policies to configure for Aodh API.
|
|
e.g. { aodh-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
|
default: {}
|
|
type: json
|
|
|
|
resources:
|
|
AodhBase:
|
|
type: ./aodh-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
ApacheServiceBase:
|
|
type: ./apache.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
EnableInternalTLS: {get_param: EnableInternalTLS}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Aodh API service.
|
|
value:
|
|
service_name: aodh_api
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionAodhApi}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [AodhBase, role_data, config_settings]
|
|
- get_attr: [ApacheServiceBase, role_data, config_settings]
|
|
- aodh::wsgi::apache::ssl: {get_param: EnableInternalTLS}
|
|
aodh::wsgi::apache::servername:
|
|
str_replace:
|
|
template:
|
|
"%{hiera('fqdn_$NETWORK')}"
|
|
params:
|
|
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
|
|
aodh::wsgi::apache::wsgi_process_display_name: 'aodh_wsgi'
|
|
aodh::api::service_name: 'httpd'
|
|
aodh::api::enable_proxy_headers_parsing: true
|
|
aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject}
|
|
aodh::policy::policies: {get_param: AodhApiPolicies}
|
|
tripleo.aodh_api.firewall_rules:
|
|
'128 aodh-api':
|
|
dport:
|
|
- 8042
|
|
- 13042
|
|
aodh::api::host:
|
|
str_replace:
|
|
template:
|
|
"%{hiera('fqdn_$NETWORK')}"
|
|
params:
|
|
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
|
|
# NOTE: bind IP is found in hiera 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::wsgi::apache::bind_host:
|
|
str_replace:
|
|
template:
|
|
"%{hiera('$NETWORK')}"
|
|
params:
|
|
$NETWORK: {get_param: [ServiceNetMap, AodhApiNetwork]}
|
|
service_config_settings:
|
|
get_attr: [AodhBase, role_data, service_config_settings]
|
|
step_config: |
|
|
include tripleo::profile::base::aodh::api
|
|
metadata_settings:
|
|
get_attr: [ApacheServiceBase, role_data, metadata_settings]
|
|
upgrade_tasks:
|
|
list_concat:
|
|
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
|
|
-
|
|
- name: Stop aodh_api service (running under httpd)
|
|
when: step|int == 1
|
|
service: name=httpd state=stopped
|