From 95343d26c8d2cc9789b87a77748b3e7becd548ca Mon Sep 17 00:00:00 2001
From: "carey.xu" <carey.xuhan@huawei.com>
Date: Fri, 18 Sep 2015 14:55:04 +0800
Subject: separate the mgmt vip from public vip, remove HA_VIP

Change-Id: Iaa877b7ce93ba9c12bc9be6f3bd101779f07ae9c
JIRA: COMPASS-51
---
 .../adapters/ansible/roles/cinder-controller/templates/cinder.conf  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf')

diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
index e34fd2fa..cf41817b 100644
--- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
+++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf
@@ -22,7 +22,7 @@ rabbit_userid = {{ RABBIT_USER }}
 rabbit_password = {{ RABBIT_PASS }}
 my_ip = {{ storage_controller_host }}
 
-glance_host = {{ HA_VIP }}
+glance_host = {{ internal_vip.ip }}
 glance_port = 9292
 api_rate_limit = False
 storage_availability_zone = nova
@@ -53,8 +53,8 @@ volumes_dir=/var/lib/cinder/volumes
 volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
 
 [keystone_authtoken]
-auth_uri = http://{{ HA_VIP }}:5000/v2.0
-identity_uri = http://{{ HA_VIP }}:35357
+auth_uri = http://{{ internal_vip.ip }}:5000/v2.0
+identity_uri = http://{{ internal_vip.ip }}:35357
 admin_tenant_name = service
 admin_user = cinder
 admin_password = {{ CINDER_PASS }}
-- 
cgit 1.2.3-korg

switch'/></form></td></tr>
<tr><td class='sub'>Unnamed repository</td><td class='sub right'>Grokmirror user</td></tr></table>
<table class='tabs'><tr><td>
<a href='/apex-tripleo-heat-templates/about/?h=stable/euphrates'>about</a><a href='/apex-tripleo-heat-templates/?h=stable/euphrates'>summary</a><a href='/apex-tripleo-heat-templates/refs/?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>refs</a><a href='/apex-tripleo-heat-templates/log/environments/hyperconverged-ceph.yaml?h=stable/euphrates'>log</a><a class='active' href='/apex-tripleo-heat-templates/tree/environments/hyperconverged-ceph.yaml?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>tree</a><a href='/apex-tripleo-heat-templates/commit/environments/hyperconverged-ceph.yaml?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>commit</a><a href='/apex-tripleo-heat-templates/diff/environments/hyperconverged-ceph.yaml?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>diff</a><a href='/apex-tripleo-heat-templates/stats/environments/hyperconverged-ceph.yaml?h=stable/euphrates'>stats</a></td><td class='form'><form class='right' method='get' action='/apex-tripleo-heat-templates/log/environments/hyperconverged-ceph.yaml'>
<input type='hidden' name='h' value='stable/euphrates'/><input type='hidden' name='id' value='f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/apex-tripleo-heat-templates/tree/?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>root</a>/<a href='/apex-tripleo-heat-templates/tree/environments?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>environments</a>/<a href='/apex-tripleo-heat-templates/tree/environments/hyperconverged-ceph.yaml?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>hyperconverged-ceph.yaml</a></div><div class='content'>blob: 77fa5a49fa6d81fbc9427ff54888039ec2accaaa (<a href='/apex-tripleo-heat-templates/plain/environments/hyperconverged-ceph.yaml?h=stable/euphrates&amp;id=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
</pre></td>
<td class='lines'><pre><code>