summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-11 10:32:37 +0000
committerGerrit Code Review <review@openstack.org>2016-07-11 10:32:37 +0000
commitbb32bce09724ae763bc6e335b34757ae6b77a11e (patch)
tree79dd70f1f13077c540e5a5176249d33e327475eb /puppet
parent53b60a88ccae5a0b8b97b763c83fe7fdf9a7067d (diff)
parentdd38017922e9589f8d68b232c9a4ae21797e67f5 (diff)
Merge "Move glance::db data within service template"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/database.yaml8
-rw-r--r--puppet/services/glance-registry.yaml7
2 files changed, 7 insertions, 8 deletions
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