Change overcloud to use VIP for MySQL

[apex-tripleo-heat-templates.git] / block-storage.yaml

diff --git a/block-storage.yaml b/block-storage.yaml
index 3e5f460..bf539e2 100644 (file)
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -30,7 +30,7 @@ resources:
       config: {get_resource: BlockStorageConfig}
       input_values:
         controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
-        cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [controller0, networks, ctlplane, 0]} , '/cinder']]}
+        cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
         neutron_local_ip: {get_attr: [BlockStorage0 , networks, ctlplane, 0]}
       signal_transport: NO_SIGNAL
   BlockStorageConfig:
@@ -49,7 +49,6 @@ resources:
             get_param: CinderPassword
           iscsi-helper:
             get_param: CinderISCSIHelper
-        admin-password: {get_param: AdminPassword}
         rabbit:
           host: {get_input: controller_host}
           username: {get_param: RabbitUserName}
@@ -63,28 +62,3 @@ resources:
             enable_tunneling: {get_param: NeutronEnableTunnelling}
           service-password:
             get_param: NeutronPassword
-        config:
-          keystone:
-            host: {get_input: controller_host}
-          cinder:
-            db: {get_input: cinder_dsn}
-            volume_size_mb:
-              get_param: CinderLVMLoopDeviceSize
-            service-password:
-              get_param: CinderPassword
-            iscsi-helper:
-              get_param: CinderISCSIHelper
-          admin-password: {get_param: AdminPassword}
-          rabbit:
-            host: {get_input: controller_host}
-            username: {get_param: RabbitUserName}
-            password: {get_param: RabbitPassword}
-          interfaces:
-            control: {get_param: NeutronPublicInterface}
-          neutron:
-            ovs:
-              local_ip: { get_input: neutron_local_ip }
-              tenant_network_type: {get_param: NeutronNetworkType}
-              enable_tunneling: {get_param: NeutronEnableTunnelling}
-            service-password:
-              get_param: NeutronPassword