aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorDavid Moreau Simard <dms@redhat.com>2016-02-05 10:34:57 -0500
committerDavid Moreau Simard <dms@redhat.com>2016-02-10 15:44:14 -0500
commit65353adb6f4dce73c9c7384bd9cbbea6b09f3e6c (patch)
treee7b35aeb86fba5c86d867311c437a61a43a6eebc /puppet/controller.yaml
parent2125ffc65073d172b70c49f933ba3f7c442d1ff0 (diff)
Nova now requires an api database to be created
This enables the creation of the nova_api database that is now mandatory since https://review.openstack.org/#/c/245828/ Change-Id: Ia8242f23864ebb14ccf858a77ba754059e9c2d4a Related-Bug: #1539793
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index ea19c711..c80d76cc 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1104,6 +1104,14 @@ resources:
- '@'
- {get_param: MysqlVirtualIP}
- '/nova'
+ nova_api_dsn:
+ list_join:
+ - ''
+ - - 'mysql+pymysql://nova_api:'
+ - {get_param: NovaPassword}
+ - '@'
+ - {get_param: MysqlVirtualIP}
+ - '/nova_api'
instance_name_template: {get_param: InstanceNameTemplate}
fencing_config: {get_param: FencingConfig}
pcsd_password: {get_param: PcsdPassword}
@@ -1466,6 +1474,7 @@ resources:
nova::api::ec2_workers: {get_input: nova_workers}
nova::api::metadata_workers: {get_input: nova_workers}
nova::database_connection: {get_input: nova_dsn}
+ nova::api_database_connection: {get_input: nova_api_dsn}
nova::glance_api_servers: {get_input: glance_api_servers}
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
nova::api::instance_name_template: {get_input: instance_name_template}
@@ -1474,6 +1483,7 @@ resources:
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
nova::vncproxy::host: {get_input: nova_api_network}
nova::db::mysql::password: {get_input: nova_password}
+ nova::db::mysql_api::password: {get_input: nova_password}
nova_enable_db_purge: {get_input: nova_enable_db_purge}
# Horizon