From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 6 Jul 2016 20:03:04 +0000 (-0500)
Subject: wrong vip for rabbitmq correcting it.
X-Git-Tag: colorado.1.0~93
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=30e949d21abe6fb009feb2c2aa3111a85d5258c4;p=joid.git

wrong vip for rabbitmq correcting it.

Change-Id: I32e20cd2dcd789566ee61cfa70a0dc4c4ca3503a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/bundle_tpl/nova-cloud-controller.yaml b/ci/bundle_tpl/nova-cloud-controller.yaml
index 4f51c30c..47421145 100644
--- a/ci/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/bundle_tpl/nova-cloud-controller.yaml
@@ -3,6 +3,7 @@
       num_units: {{ unit_qty() }}
       options:
         console-access-protocol: novnc
+        neutron-external-network: ext-net
 {% if opnfv.domain is defined %}
         console-proxy-ip: {{ opnfv.domain }}
 {% endif %}
diff --git a/ci/bundle_tpl/rabbitmq.yaml b/ci/bundle_tpl/rabbitmq.yaml
index d7f9c127..1020340f 100644
--- a/ci/bundle_tpl/rabbitmq.yaml
+++ b/ci/bundle_tpl/rabbitmq.yaml
@@ -3,7 +3,7 @@
       num_units: {{ unit_qty() }}
       options:
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.mysql }}
+        vip: {{ opnfv.vip.rabbitmq }}
         min-cluster-size: {{ unit_qty() }}
 {% endif %}
       to:
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 81bab00f..c58b8ad1 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -126,25 +126,25 @@ create_openrc
 ## Create external subnet Network
 ##
 
-#neutron net-create ext_net --shared --router:external=True
-neutron net-create ext_net --router:external=True
+#neutron net-create ext-net --shared --router:external=True
+neutron net-create ext-net --router:external=True
 
 if [ "onos" == "$1" ]; then
     launch_eth
-    neutron subnet-create ext_net --name ext-subnet \
+    neutron subnet-create ext-net --name ext-subnet \
        --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
        --disable-dhcp --gateway $EXTNET_GW --dns-nameserver 8.8.8.8 $EXTNET_NET
-    #neutron subnet-create ext_net --name ext-subnet $EXTNET_NET
+    #neutron subnet-create ext-net --name ext-subnet $EXTNET_NET
     #update_gw_mac
 elif [ "nosdn" == "$1" ]; then
-    neutron subnet-create ext_net --name ext-subnet \
+    neutron subnet-create ext-net --name ext-subnet \
        --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
        --disable-dhcp --gateway $EXTNET_GW --dns-nameserver 8.8.8.8 $EXTNET_NET
     # configure security groups
     #neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default
     #neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default
 else
-    neutron subnet-create ext_net --name ext-subnet \
+    neutron subnet-create ext-net --name ext-subnet \
        --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
        --disable-dhcp --gateway $EXTNET_GW --dns-nameserver 8.8.8.8 $EXTNET_NET
 fi