Make the DB URIs host-independent for all services
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
This commit is contained in:
parent
fcda1872cf
commit
90431683b5
|
@ -65,6 +65,7 @@
|
||||||
- OS::TripleO::Services::Core
|
- OS::TripleO::Services::Core
|
||||||
- OS::TripleO::Services::Kernel
|
- OS::TripleO::Services::Kernel
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::RabbitMQ
|
- OS::TripleO::Services::RabbitMQ
|
||||||
- OS::TripleO::Services::HAproxy
|
- OS::TripleO::Services::HAproxy
|
||||||
- OS::TripleO::Services::Keepalived
|
- OS::TripleO::Services::Keepalived
|
||||||
|
|
|
@ -15,6 +15,7 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -28,6 +28,7 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::SaharaApi
|
- OS::TripleO::Services::SaharaApi
|
||||||
- OS::TripleO::Services::SaharaEngine
|
- OS::TripleO::Services::SaharaEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::RabbitMQ
|
- OS::TripleO::Services::RabbitMQ
|
||||||
- OS::TripleO::Services::HAproxy
|
- OS::TripleO::Services::HAproxy
|
||||||
- OS::TripleO::Services::Keepalived
|
- OS::TripleO::Services::Keepalived
|
||||||
|
|
|
@ -19,6 +19,7 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -15,6 +15,7 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -17,6 +17,7 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -19,6 +19,7 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -245,6 +245,7 @@ resource_registry:
|
||||||
OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None
|
OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None
|
||||||
OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None
|
OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None
|
||||||
OS::TripleO::Services::OctaviaWorker: OS::Heat::None
|
OS::TripleO::Services::OctaviaWorker: OS::Heat::None
|
||||||
|
OS::TripleO::Services::MySQLClient: puppet/services/database/mysql-client.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
EnablePackageInstall: false
|
EnablePackageInstall: false
|
||||||
|
|
|
@ -69,8 +69,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/aodh'
|
- '/aodh'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
aodh::debug: {get_param: Debug}
|
aodh::debug: {get_param: Debug}
|
||||||
aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
||||||
aodh::rabbit_userid: {get_param: RabbitUserName}
|
aodh::rabbit_userid: {get_param: RabbitUserName}
|
||||||
|
|
|
@ -105,8 +105,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/barbican'
|
- '/barbican'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
tripleo.barbican_api.firewall_rules:
|
tripleo.barbican_api.firewall_rules:
|
||||||
'117 barbican':
|
'117 barbican':
|
||||||
dport:
|
dport:
|
||||||
|
|
|
@ -93,8 +93,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/ceilometer'
|
- '/ceilometer'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
ceilometer_backend: {get_param: CeilometerBackend}
|
ceilometer_backend: {get_param: CeilometerBackend}
|
||||||
# we include db_sync class in puppet-tripleo
|
# we include db_sync class in puppet-tripleo
|
||||||
ceilometer::db::sync_db: false
|
ceilometer::db::sync_db: false
|
||||||
|
|
|
@ -100,8 +100,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/cinder'
|
- '/cinder'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
cinder::debug: {get_param: Debug}
|
cinder::debug: {get_param: Debug}
|
||||||
cinder::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
cinder::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
||||||
cinder::rabbit_userid: {get_param: RabbitUserName}
|
cinder::rabbit_userid: {get_param: RabbitUserName}
|
||||||
|
|
|
@ -64,8 +64,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/congress'
|
- '/congress'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
congress::keystone::auth::tenant: 'service'
|
congress::keystone::auth::tenant: 'service'
|
||||||
congress::keystone::auth::password: {get_param: CongressPassword}
|
congress::keystone::auth::password: {get_param: CongressPassword}
|
||||||
congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
congress::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
heat_template_version: ocata
|
||||||
|
|
||||||
|
description: >
|
||||||
|
Mysql client settings
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
outputs:
|
||||||
|
role_data:
|
||||||
|
description: Role for setting mysql client parameters
|
||||||
|
value:
|
||||||
|
service_name: mysql_client
|
||||||
|
config_settings:
|
||||||
|
tripleo::profile::base:database::mysql::client_bind_address: {get_param: [ServiceNetMap, MysqlNetwork]}
|
||||||
|
step_config: |
|
||||||
|
include ::tripleo::profile::base::database::mysql::client
|
|
@ -90,8 +90,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/ec2_api'
|
- '/ec2_api'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- nova_workers_zero
|
- nova_workers_zero
|
||||||
|
|
|
@ -91,8 +91,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/glance'
|
- '/glance'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]}
|
glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]}
|
||||||
glance::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
glance::api::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||||
glance::api::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
glance::api::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
||||||
|
|
|
@ -67,8 +67,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/gnocchi'
|
- '/gnocchi'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
gnocchi::db::sync::extra_opts: '--skip-storage'
|
gnocchi::db::sync::extra_opts: '--skip-storage'
|
||||||
gnocchi::storage::swift::swift_user: 'service:gnocchi'
|
gnocchi::storage::swift::swift_user: 'service:gnocchi'
|
||||||
gnocchi::storage::swift::swift_auth_version: 2
|
gnocchi::storage::swift::swift_auth_version: 2
|
||||||
|
|
|
@ -111,8 +111,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/heat'
|
- '/heat'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
|
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
|
||||||
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
|
heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword}
|
||||||
heat::engine::auth_encryption_key:
|
heat::engine::auth_encryption_key:
|
||||||
|
|
|
@ -60,8 +60,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/ironic'
|
- '/ironic'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
ironic::debug: {get_param: Debug}
|
ironic::debug: {get_param: Debug}
|
||||||
ironic::rabbit_userid: {get_param: RabbitUserName}
|
ironic::rabbit_userid: {get_param: RabbitUserName}
|
||||||
ironic::rabbit_password: {get_param: RabbitPassword}
|
ironic::rabbit_password: {get_param: RabbitPassword}
|
||||||
|
|
|
@ -193,8 +193,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/keystone'
|
- '/keystone'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
keystone::admin_token: {get_param: AdminToken}
|
keystone::admin_token: {get_param: AdminToken}
|
||||||
keystone::admin_password: {get_param: AdminPassword}
|
keystone::admin_password: {get_param: AdminPassword}
|
||||||
keystone::roles::admin::password: {get_param: AdminPassword}
|
keystone::roles::admin::password: {get_param: AdminPassword}
|
||||||
|
|
|
@ -67,8 +67,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/manila'
|
- '/manila'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
mysql:
|
mysql:
|
||||||
manila::db::mysql::password: {get_param: ManilaPassword}
|
manila::db::mysql::password: {get_param: ManilaPassword}
|
||||||
|
|
|
@ -65,8 +65,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/mistral'
|
- '/mistral'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
mistral::rabbit_userid: {get_param: RabbitUserName}
|
mistral::rabbit_userid: {get_param: RabbitUserName}
|
||||||
mistral::rabbit_password: {get_param: RabbitPassword}
|
mistral::rabbit_password: {get_param: RabbitPassword}
|
||||||
mistral::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
mistral::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
||||||
|
|
|
@ -127,8 +127,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/ovs_neutron'
|
- '/ovs_neutron'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||||
neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||||
neutron::server::api_workers: {get_param: NeutronWorkers}
|
neutron::server::api_workers: {get_param: NeutronWorkers}
|
||||||
|
|
|
@ -100,8 +100,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/ovs_neutron'
|
- '/ovs_neutron'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
neutron::plugins::plumgrid::controller_priv_host: {get_param: [EndpointMap, KeystoneInternal, host]}
|
neutron::plugins::plumgrid::controller_priv_host: {get_param: [EndpointMap, KeystoneInternal, host]}
|
||||||
neutron::plugins::plumgrid::admin_password: {get_param: AdminPassword}
|
neutron::plugins::plumgrid::admin_password: {get_param: AdminPassword}
|
||||||
neutron::plugins::plumgrid::metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
neutron::plugins::plumgrid::metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
|
||||||
|
|
|
@ -150,6 +150,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/nova'
|
- '/nova'
|
||||||
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
nova::api_database_connection:
|
nova::api_database_connection:
|
||||||
list_join:
|
list_join:
|
||||||
- ''
|
- ''
|
||||||
|
@ -159,6 +160,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/nova_api'
|
- '/nova_api'
|
||||||
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
nova::placement_database_connection:
|
nova::placement_database_connection:
|
||||||
list_join:
|
list_join:
|
||||||
- ''
|
- ''
|
||||||
|
@ -168,6 +170,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/nova_placement'
|
- '/nova_placement'
|
||||||
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
nova::debug: {get_param: Debug}
|
nova::debug: {get_param: Debug}
|
||||||
nova::purge_config: {get_param: EnableConfigPurge}
|
nova::purge_config: {get_param: EnableConfigPurge}
|
||||||
nova::network::neutron::neutron_project_name: 'service'
|
nova::network::neutron::neutron_project_name: 'service'
|
||||||
|
|
|
@ -66,8 +66,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/octavia'
|
- '/octavia'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||||
octavia::keystone::authtoken::project_name: 'service'
|
octavia::keystone::authtoken::project_name: 'service'
|
||||||
octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
|
octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
|
||||||
|
|
|
@ -46,8 +46,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/panko'
|
- '/panko'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
panko::debug: {get_param: Debug}
|
panko::debug: {get_param: Debug}
|
||||||
panko::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
panko::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
||||||
panko::keystone::authtoken::project_name: 'service'
|
panko::keystone::authtoken::project_name: 'service'
|
||||||
|
|
|
@ -64,8 +64,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/sahara'
|
- '/sahara'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
sahara::rabbit_password: {get_param: RabbitPassword}
|
sahara::rabbit_password: {get_param: RabbitPassword}
|
||||||
sahara::rabbit_user: {get_param: RabbitUserName}
|
sahara::rabbit_user: {get_param: RabbitUserName}
|
||||||
sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
sahara::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
|
||||||
|
|
|
@ -64,8 +64,7 @@ outputs:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host]}
|
- {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
- '/tacker'
|
- '/tacker'
|
||||||
- '?bind_address='
|
- '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo'
|
||||||
- "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
|
|
||||||
|
|
||||||
tacker::keystone::auth::tenant: 'service'
|
tacker::keystone::auth::tenant: 'service'
|
||||||
tacker::keystone::auth::password: {get_param: TackerPassword}
|
tacker::keystone::auth::password: {get_param: TackerPassword}
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
- OS::TripleO::Services::HeatApiCloudwatch
|
- OS::TripleO::Services::HeatApiCloudwatch
|
||||||
- OS::TripleO::Services::HeatEngine
|
- OS::TripleO::Services::HeatEngine
|
||||||
- OS::TripleO::Services::MySQL
|
- OS::TripleO::Services::MySQL
|
||||||
|
- OS::TripleO::Services::MySQLClient
|
||||||
- OS::TripleO::Services::NeutronDhcpAgent
|
- OS::TripleO::Services::NeutronDhcpAgent
|
||||||
- OS::TripleO::Services::NeutronL3Agent
|
- OS::TripleO::Services::NeutronL3Agent
|
||||||
- OS::TripleO::Services::NeutronMetadataAgent
|
- OS::TripleO::Services::NeutronMetadataAgent
|
||||||
|
|
|
@ -62,14 +62,12 @@ def validate_mysql_connection(settings):
|
||||||
return items == ['EndpointMap', 'MysqlInternal', 'protocol']
|
return items == ['EndpointMap', 'MysqlInternal', 'protocol']
|
||||||
|
|
||||||
def client_bind_address(item):
|
def client_bind_address(item):
|
||||||
return 'bind_address' in item
|
return 'read_default_file' in item and \
|
||||||
|
'read_default_group' in item
|
||||||
|
|
||||||
def validate_mysql_uri(key, items):
|
def validate_mysql_uri(key, items):
|
||||||
# Only consider a connection if it targets mysql
|
# Only consider a connection if it targets mysql
|
||||||
# TODO(owalsh): skip nova mysql uris,temporary workaround for
|
if key.endswith('connection') and \
|
||||||
# tripleo/+bug/1662344
|
|
||||||
if not key.startswith('nova') and \
|
|
||||||
key.endswith('connection') and \
|
|
||||||
search(items, mysql_protocol, no_op):
|
search(items, mysql_protocol, no_op):
|
||||||
# Assume the "bind_address" option is one of
|
# Assume the "bind_address" option is one of
|
||||||
# the token that made up the uri
|
# the token that made up the uri
|
||||||
|
|
Loading…
Reference in New Issue