summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-11 10:32:00 +0000
committerGerrit Code Review <review@openstack.org>2016-07-11 10:32:00 +0000
commit53b60a88ccae5a0b8b97b763c83fe7fdf9a7067d (patch)
tree0987f90d31bdd61e277a1d76e131befade95e8fc
parent986c983abc6751243183bca252149f8085a4ca84 (diff)
parentaabde9a45015abebc7b29b9ca0cd2f76b5797a48 (diff)
Merge "Move keystone::db data within service template"
-rw-r--r--puppet/hieradata/database.yaml8
-rw-r--r--puppet/services/keystone.yaml7
2 files changed, 7 insertions, 8 deletions
diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 9cbff586..d59afb41 100644
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -21,14 +21,6 @@ glance::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
-# Keystone
-keystone::db::mysql::user: keystone
-keystone::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-keystone::db::mysql::dbname: keystone
-keystone::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/keystone.yaml b/puppet/services/keystone.yaml
index 25d92d4a..0ad6025c 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -128,5 +128,12 @@ outputs:
keystone::public_workers: {get_param: KeystoneWorkers}
keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
keystone::public_endpoint: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
+ keystone::db::mysql::user: keystone
+ keystone::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+ keystone::db::mysql::dbname: keystone
+ keystone::db::mysql::allowed_hosts:
+ - '%'
+ - "%{hiera('mysql_bind_host')}"
+
step_config: |
include ::tripleo::profile::base::keystone