diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 15:51:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 15:51:05 +0000 |
| commit | 5883da64d7980b60fcd2b2a6db9b77097f27afb9 (patch) | |
| tree | 7e6025986aa884f9625145da3947882b1e22a2ec | |
| parent | f352773cf37027724ea0252bd18a8ab3fe7b99e9 (diff) | |
| parent | 1cc63d5e3d4557d5ce3bdc9dfb7b87b7726198b4 (diff) | |
Merge "Use MysqlVirtualIPUri for nova_api and sahara database"
| -rw-r--r-- | puppet/controller.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 07c1b493..5c192025 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1164,7 +1164,7 @@ resources: - - 'mysql+pymysql://nova_api:' - {get_param: NovaPassword} - '@' - - {get_param: MysqlVirtualIP} + - {get_param: MysqlVirtualIPUri} - '/nova_api' upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute} instance_name_template: {get_param: InstanceNameTemplate} @@ -1204,7 +1204,7 @@ resources: - - 'mysql://sahara:' - {get_param: SaharaPassword} - '@' - - {get_param: MysqlVirtualIP} + - {get_param: MysqlVirtualIPUri} - '/sahara' swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]} swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} |