diff options
author | 2016-02-12 13:19:44 +0000 | |
---|---|---|
committer | 2016-02-12 13:19:44 +0000 | |
commit | 8d763fc70c33695a4752b04656d3904561cc19f3 (patch) | |
tree | 9e350064ae64ddaeb898a678a9f084d83ca30bf5 /puppet/controller.yaml | |
parent | 20fc1118fda24946ada541ebc435896253c2a911 (diff) | |
parent | 65353adb6f4dce73c9c7384bd9cbbea6b09f3e6c (diff) |
Merge "Nova now requires an api database to be created"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 8fdddff9..bad99378 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} @@ -1468,6 +1476,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} @@ -1476,6 +1485,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 |