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
---
 .../ansible/roles/odl_cluster/tasks/openvswitch.yml        |  2 +-
 .../adapters/ansible/roles/odl_cluster/templates/akka.conf | 14 +++++++-------
 .../ansible/roles/odl_cluster/templates/ml2_conf.sh        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'deploy/adapters/ansible/roles/odl_cluster')

diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml
index 33ab6841..f301cba2 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/openvswitch.yml
@@ -29,7 +29,7 @@
 #    service openvswitch-switch start ;
 
 - name: Set OpenDaylight as the manager
-  command: su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ HA_VIP }}:6640;"
+  command: su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_vip.ip }}:6640;"
 
 #- name: start and disable Neutron's agent services
 #  service: name=neutron-plugin-openvswitch-agent state=started
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
index 318a8729..77798498 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/akka.conf
@@ -28,7 +28,7 @@ odl-cluster-data {
     remote {
       log-remote-lifecycle-events = off
       netty.tcp {
-        hostname = "{{ hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}"
+        hostname = "{{ hostvars[inventory_hostname]['ansible_' + internal_nic].ipv4.address }}"
         port = 2550
         maximum-frame-size = 419430400
         send-buffer-size = 52428800
@@ -40,9 +40,9 @@ odl-cluster-data {
       seed-nodes = [
 {% for host in groups['odl'] %}
     {% if loop.last %}
-                    "akka.tcp://opendaylight-cluster-data@{{ hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:2550"
+                    "akka.tcp://opendaylight-cluster-data@{{ hostvars[host]['ansible_' + internal_nic].ipv4.address }}:2550"
     {% else %}
-                    "akka.tcp://opendaylight-cluster-data@{{ hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:2550",
+                    "akka.tcp://opendaylight-cluster-data@{{ hostvars[host]['ansible_' + internal_nic].ipv4.address }}:2550",
     {% endif %}
 {% endfor %}
                    ]
@@ -53,7 +53,7 @@ odl-cluster-data {
 {% set key = 0 %}
 {% for host in groups['odl'] %}
     {% set key = key + 1 %}
-    {% if  hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address  ==  hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address  %}
+    {% if  hostvars[host]['ansible_' + internal_nic].ipv4.address  ==  hostvars[inventory_hostname]['ansible_' + internal_nic].ipv4.address  %}
         "member-{{ key }}"
     {% endif %}
 {% endfor %}
@@ -83,7 +83,7 @@ odl-cluster-rpc {
     remote {
       log-remote-lifecycle-events = off
       netty.tcp {
-        hostname = "{{ hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}"
+        hostname = "{{ hostvars[inventory_hostname]['ansible_' + internal_nic].ipv4.address }}"
         port = 2551
       }
     }
@@ -92,9 +92,9 @@ odl-cluster-rpc {
       seed-nodes = [
 {% for host in groups['odl'] %}
     {% if loop.last %}
-                    "akka.tcp://odl-cluster-rpc@{{ hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:2551"
+                    "akka.tcp://odl-cluster-rpc@{{ hostvars[host]['ansible_' + internal_nic].ipv4.address }}:2551"
     {% else %}
-                    "akka.tcp://odl-cluster-rpc@{{ hostvars[host]['ansible_' + INTERNAL_INTERFACE].ipv4.address }}:2551",
+                    "akka.tcp://odl-cluster-rpc@{{ hostvars[host]['ansible_' + internal_nic].ipv4.address }}:2551",
     {% endif %}
 {% endfor %}
                    ]
diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
index 7f61d367..77c55656 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
+++ b/deploy/adapters/ansible/roles/odl_cluster/templates/ml2_conf.sh
@@ -2,5 +2,5 @@ cat <<EOT>> /etc/neutron/plugins/ml2/ml2_conf.ini
 [ml2_odl]
 password = admin
 username = admin
-url = http://{{ HA_VIP }}:8080/controller/nb/v2/neutron
+url = http://{{ internal_vip.ip }}:8080/controller/nb/v2/neutron
 EOT
-- 
cgit 1.2.3-korg