From dd38017922e9589f8d68b232c9a4ae21797e67f5 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 29 Jun 2016 12:53:33 +0200 Subject: Move glance::db data within service template Change-Id: I405bc9895160cc867f933e6b0d56546d460d2e3a --- puppet/hieradata/database.yaml | 8 -------- puppet/services/glance-registry.yaml | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'puppet') diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml index d59afb41..a100ae39 100644 --- a/puppet/hieradata/database.yaml +++ b/puppet/hieradata/database.yaml @@ -13,14 +13,6 @@ nova::db::mysql_api::allowed_hosts: - '%' - "%{hiera('mysql_bind_host')}" -# Glance -glance::db::mysql::user: glance -glance::db::mysql::host: "%{hiera('mysql_virtual_ip')}" -glance::db::mysql::dbname: glance -glance::db::mysql::allowed_hosts: - - '%' - - "%{hiera('mysql_bind_host')}" - # Neutron neutron::db::mysql::user: neutron neutron::db::mysql::host: "%{hiera('mysql_virtual_ip')}" diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml index 6f2f0372..d71157f9 100644 --- a/puppet/services/glance-registry.yaml +++ b/puppet/services/glance-registry.yaml @@ -41,5 +41,12 @@ outputs: glance::registry::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } 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::dbname: glance + glance::db::mysql::allowed_hosts: + - '%' + - "%{hiera('mysql_bind_host')}" + step_config: | include ::tripleo::profile::base::glance::registry -- cgit 1.2.3-korg