summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-12 13:19:44 +0000
committerGerrit Code Review <review@openstack.org>2016-02-12 13:19:44 +0000
commit8d763fc70c33695a4752b04656d3904561cc19f3 (patch)
tree9e350064ae64ddaeb898a678a9f084d83ca30bf5 /puppet/hieradata
parent20fc1118fda24946ada541ebc435896253c2a911 (diff)
parent65353adb6f4dce73c9c7384bd9cbbea6b09f3e6c (diff)
Merge "Nova now requires an api database to be created"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/controller.yaml1
-rw-r--r--puppet/hieradata/database.yaml7
2 files changed, 8 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 13f4eec7..a4dda4b4 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -87,6 +87,7 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
nova::notify_on_state_change: 'vm_and_task_state'
nova::api::default_floating_pool: 'public'
nova::api::osapi_v3: true
+nova::api::sync_db_api: true
nova::scheduler::filter::ram_allocation_ratio: '1.0'
nova::cron::archive_deleted_rows::hour: '*/12'
nova::cron::archive_deleted_rows::destination: '/dev/null'
diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 89577505..61714691 100644
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -6,6 +6,13 @@ nova::db::mysql::allowed_hosts:
- '%'
- "%{hiera('mysql_bind_host')}"
+nova::db::mysql_api::user: nova_api
+nova::db::mysql_api::host: "%{hiera('mysql_virtual_ip')}"
+nova::db::mysql_api::dbname: nova_api
+nova::db::mysql_api::allowed_hosts:
+ - '%'
+ - "%{hiera('mysql_bind_host')}"
+
# Glance
glance::db::mysql::user: glance
glance::db::mysql::host: "%{hiera('mysql_virtual_ip')}"