From 248390bbe38bbec0cc8fc748cd0763d16686f6f5 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 21 Jul 2016 18:43:55 +0200 Subject: Move mysql::host param from MysqlInternal to MysqlNoBracketsInternal The ::host parameter expects IPv6 addresses withouth brackets; this change aligns the remaining services to use MysqlNoBracketsInternal as it happens already for the others (eg. Keystone). Change-Id: Ia72d325447408b1cb5fea836034bbcd75d17ddf1 --- puppet/services/ceilometer-base.yaml | 2 +- puppet/services/cinder-base.yaml | 2 +- puppet/services/glance-registry.yaml | 2 +- puppet/services/gnocchi-base.yaml | 2 +- puppet/services/heat-engine.yaml | 2 +- puppet/services/neutron-server.yaml | 2 +- puppet/services/sahara-engine.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'puppet') diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 1dea785f..a5e14577 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -98,7 +98,7 @@ outputs: ceilometer::rabbit_use_ssl: {get_param: RabbitClientUseSSL} ceilometer::rabbit_port: {get_param: RabbitClientPort} ceilometer::db::mysql::user: ceilometer - ceilometer::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]} + ceilometer::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} ceilometer::db::mysql::dbname: ceilometer ceilometer::db::mysql::allowed_hosts: - '%' diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index f6d2b645..88496598 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -57,7 +57,7 @@ outputs: cinder::rabbit_password: {get_param: RabbitPassword} cinder::rabbit_port: {get_param: RabbitClientPort} cinder::db::mysql::user: cinder - cinder::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]} + cinder::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} cinder::db::mysql::dbname: cinder cinder::db::mysql::allowed_hosts: - '%' diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml index d71157f9..f9bf7256 100644 --- a/puppet/services/glance-registry.yaml +++ b/puppet/services/glance-registry.yaml @@ -42,7 +42,7 @@ outputs: glance::registry::debug: {get_param: Debug} glance::registry::workers: {get_param: GlanceWorkers} glance::db::mysql::user: glance - glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]} + glance::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} glance::db::mysql::dbname: glance glance::db::mysql::allowed_hosts: - '%' diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index e49c440b..37716a9d 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -84,7 +84,7 @@ outputs: gnocchi::statsd::flush_delay: 10 gnocchi::statsd::archive_policy_name: 'low' gnocchi::db::mysql::user: gnocchi - gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]} + gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} gnocchi::db::mysql::dbname: gnocchi gnocchi::db::mysql::allowed_hosts: - '%' diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index 77af55ef..bb7a19bf 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -55,7 +55,7 @@ outputs: heat::db::mysql::password: {get_param: HeatPassword} heat::keystone::domain::domain_password: {get_param: HeatStackDomainAdminPassword} heat::db::mysql::user: heat - heat::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]} + heat::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} heat::db::mysql::dbname: heat heat::db::mysql::allowed_hosts: - '%' diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml index d759d420..4303612c 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-server.yaml @@ -66,7 +66,7 @@ outputs: neutron::server::notifications::password: {get_param: NovaPassword} neutron::db::mysql::password: {get_param: NeutronPassword} neutron::db::mysql::user: neutron - neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]} + neutron::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} neutron::db::mysql::dbname: ovs_neutron neutron::db::mysql::allowed_hosts: - '%' diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml index f0411a35..1efdb758 100644 --- a/puppet/services/sahara-engine.yaml +++ b/puppet/services/sahara-engine.yaml @@ -38,7 +38,7 @@ outputs: sahara::database_connection: *sahara_dsn sahara::db::mysql::password: {get_param: SaharaPassword} sahara::db::mysql::user: sahara - sahara::db::mysql::host: {get_param: [EndpointMap, MysqlVirtual, host]} + sahara::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]} sahara::db::mysql::dbname: sahara sahara::db::mysql::allowed_hosts: - '%' -- cgit 1.2.3-korg