diff options
author | 2014-08-15 20:02:03 +0000 | |
---|---|---|
committer | 2014-08-15 20:02:03 +0000 | |
commit | 91fd462aae986746296d6ca3065514f8a0676b66 (patch) | |
tree | 631b7cde8c30c38f42b72aabf008f98d3ba704cc /block-storage.yaml | |
parent | 50fcd42b3a120a0e02a41224f6278faf92746a8b (diff) | |
parent | c755d5548f23b25660517896de5264f1adb9ef28 (diff) |
Merge "Use VIP for rabbit/keystone and mysql in block-storage.yaml"
Diffstat (limited to 'block-storage.yaml')
-rw-r--r-- | block-storage.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index 50577f48..7e2be4ae 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -23,7 +23,7 @@ resources: server: {get_resource: BlockStorage0} config: {get_resource: BlockStorageConfig} input_values: - controller_host: {get_attr: [controller0, networks, ctlplane, 0]} + controller_virtual_ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]} signal_transport: NO_SIGNAL BlockStorageConfig: @@ -33,7 +33,7 @@ resources: config: admin-password: {get_param: AdminPassword} keystone: - host: {get_input: controller_host} + host: {get_input: controller_virtual_ip} cinder: db: {get_input: cinder_dsn} volume_size_mb: @@ -43,6 +43,6 @@ resources: iscsi-helper: get_param: CinderISCSIHelper rabbit: - host: {get_input: controller_host} + host: {get_input: controller_virtual_ip} username: {get_param: RabbitUserName} password: {get_param: RabbitPassword} |