summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-12 17:31:04 +0000
committerGerrit Code Review <review@openstack.org>2016-01-12 17:31:04 +0000
commitc662d0f7cc2286b038e0a04f12507322fd2ba78f (patch)
tree53ee3e045979c475a2a114be8ae711224b85df0b /puppet/hieradata
parent31b05b17bfd028d16990231079c4bfde777cde40 (diff)
parentd69868ea9eec3d1f0a59b1fd6635a2c14df6e609 (diff)
Merge "Sahara Integration"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml2
-rw-r--r--puppet/hieradata/database.yaml7
2 files changed, 9 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 229f9a65..7f30fe7a 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -38,6 +38,7 @@ cinder::api::keystone_tenant: 'service'
swift::proxy::authtoken::admin_tenant_name: 'service'
ceilometer::api::keystone_tenant: 'service'
heat::keystone_tenant: 'service'
+sahara::admin_tenant_name: 'service'
# keystone
keystone::cron::token_flush::maxdelay: 3600
@@ -122,6 +123,7 @@ tripleo::loadbalancer::nova_metadata: true
tripleo::loadbalancer::nova_novncproxy: true
tripleo::loadbalancer::mysql: true
tripleo::loadbalancer::redis: true
+tripleo::loadbalancer::sahara: true
tripleo::loadbalancer::swift_proxy_server: true
tripleo::loadbalancer::ceilometer: true
tripleo::loadbalancer::heat_api: true
diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 7e925d90..89577505 100644
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -53,3 +53,10 @@ ceilometer::db::mysql::dbname: ceilometer
ceilometer::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
+
+sahara::db::mysql::user: sahara
+sahara::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
+sahara::db::mysql::dbname: sahara
+sahara::db::mysql::allowed_hosts:
+ - '%'
+ - "%{hiera('mysql_bind_host')}"