openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Use VIP for rabbit/keystone and mysql in block-storage.yaml"

Browse Source
This commit is contained in:
Jenkins 2014-08-15 20:02:03 +00:00 committed by Gerrit Code Review
commit 91fd462aae
1 changed files with 3 additions and 3 deletions

6
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}