90431683b5
When fixing LP#1643487 we added ?bind_address to all DB URIs. Since this clashes with Cellsv2 due to the URIs becoming host dependent, we need a new approach to pass bind_address to pymysql that leaves the DB URIs host-independent. In change Iff8bd2d9ee85f7bb1445aa2e1b3cfbff1f397b18 we first create a /etc/my.cnf.d/tripleo.cnf file with a [tripleo] section with the correct bind-address option. In this change we make sure that the DB URIs will point to the added file and to the specific section containing the necessary bind-address option. We do introduce a new MySQLClient profile which will hold all this more client-specific configuration so that this change can fit better in the composable roles work. Also, in the future it might contain the necessary configuration for SSL for example. Note that in case the /etc/my.cnf.d/tripleo.cnf file does not exist (because it is created via the mysqlclient profile), things keep on working as usual and the bind-address option simply won't be set, which has no impact on hosts where there are no VIPs. Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com> Change-Id: Ieac33efe38f32e949fd89545eb1cd8e0fe114a12 Related-Bug: #1643487 Closes-Bug: #1663181 Closes-Bug: #1664524 Depends-On: Iff8bd2d9ee85f7bb1445aa2e1b3cfbff1f397b18
102 lines
3.7 KiB
YAML
102 lines
3.7 KiB
YAML
heat_template_version: ocata
|
|
|
|
description: >
|
|
OpenStack Aodh service configured with Puppet
|
|
|
|
parameters:
|
|
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
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
AodhPassword:
|
|
description: The password for the aodh services.
|
|
type: string
|
|
hidden: true
|
|
RedisPassword:
|
|
description: The password for the redis service account.
|
|
type: string
|
|
hidden: true
|
|
RabbitPassword:
|
|
description: The password for RabbitMQ
|
|
type: string
|
|
hidden: true
|
|
RabbitUserName:
|
|
default: guest
|
|
description: The username for RabbitMQ
|
|
type: string
|
|
RabbitClientUseSSL:
|
|
default: false
|
|
description: >
|
|
Rabbit client subscriber parameter to specify
|
|
an SSL connection to the RabbitMQ host.
|
|
type: string
|
|
RabbitClientPort:
|
|
default: 5672
|
|
description: Set rabbit subscriber port, change this if using SSL
|
|
type: number
|
|
Debug:
|
|
default: ''
|
|
description: Set to True to enable debugging on all services.
|
|
type: string
|
|
KeystoneRegion:
|
|
type: string
|
|
default: 'regionOne'
|
|
description: Keystone region for endpoint
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Aodh role.
|
|
value:
|
|
service_name: aodh_base
|
|
config_settings:
|
|
aodh_redis_password: {get_param: RedisPassword}
|
|
aodh::db::database_connection:
|
|
list_join:
|
|
- ''
|
|
- - {get_param: [EndpointMap, MysqlInternal, protocol]}
|
|
- '://aodh:'
|
|
- {get_param: AodhPassword}
|
|
- '@'
|
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
|
- '/aodh'
|
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
|
aodh::debug: {get_param: Debug}
|
|
aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
|
aodh::rabbit_userid: {get_param: RabbitUserName}
|
|
aodh::rabbit_password: {get_param: RabbitPassword}
|
|
aodh::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
|
aodh::rabbit_port: {get_param: RabbitClientPort}
|
|
aodh::keystone::authtoken::project_name: 'service'
|
|
aodh::keystone::authtoken::password: {get_param: AodhPassword}
|
|
aodh::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
|
aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
|
aodh::auth::auth_password: {get_param: AodhPassword}
|
|
aodh::auth::auth_region: 'regionOne'
|
|
aodh::auth::auth_tenant_name: 'service'
|
|
service_config_settings:
|
|
keystone:
|
|
aodh::keystone::auth::public_url: {get_param: [EndpointMap, AodhPublic, uri]}
|
|
aodh::keystone::auth::internal_url: {get_param: [EndpointMap, AodhInternal, uri]}
|
|
aodh::keystone::auth::admin_url: {get_param: [EndpointMap, AodhAdmin, uri]}
|
|
aodh::keystone::auth::password: {get_param: AodhPassword}
|
|
aodh::keystone::auth::region: {get_param: KeystoneRegion}
|
|
aodh::keystone::auth::tenant: 'service'
|
|
mysql:
|
|
aodh::db::mysql::user: aodh
|
|
aodh::db::mysql::password: {get_param: AodhPassword}
|
|
aodh::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
|
aodh::db::mysql::dbname: aodh
|
|
aodh::db::mysql::allowed_hosts:
|
|
- '%'
|
|
- "%{hiera('mysql_bind_host')}"
|