From: zhangyuanyou <zhangyuanyou@huawei.com>
Date: Wed, 22 Jun 2016 12:35:24 +0000 (+0800)
Subject: fix onos charms for xenial.
X-Git-Tag: colorado.1.0~122^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=23433fd66f713c97a5465ac2f9e240bc9da9bb4e;p=joid.git

fix onos charms for xenial.

Change-Id: Ifc47864d874f3a7cbd395eac20ff5a68cfb32be9
Signed-off-by: Yuanyou Zhang <zhangyuanyou@huawei.com>
---

diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index 43da3785..97d109b1 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -35,8 +35,8 @@ git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build
 
 # Controller specific charm
-bzr branch lp:~wuwenbin2/onosfw/onos-controller $distro/onos-controller
-#bzr branch lp:~wuwenbin2/onosfw/neutron-gateway $distro/neutron-gateway
-bzr branch lp:~wuwenbin2/onosfw/neutron-api-onos $distro/neutron-api-onos
-bzr branch lp:~wuwenbin2/onosfw/openvswitch-onos $distro/openvswitch-onos
-bzr branch lp:~narindergupta/opnfv/neutron-gateway $distro/neutron-gateway
+bzr branch lp:~zhangyuanyou/onosfw/onos-controller $distro/onos-controller
+bzr branch lp:~zhangyuanyou/onosfw/neutron-gateway $distro/neutron-gateway
+bzr branch lp:~zhangyuanyou/onosfw/neutron-api-onos $distro/neutron-api-onos
+bzr branch lp:~zhangyuanyou/onosfw/openvswitch-onos $distro/openvswitch-onos
+#bzr branch lp:~narindergupta/opnfv/neutron-gateway $distro/neutron-gateway
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 1b36aabe..f945dd65 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -29,7 +29,7 @@ launch_eth() {
     for node in $computer_list; do
         echo "node name is ${node}"
         juju ssh $node "sudo ifconfig $EXTNET_PORT up"
-        juju ssh $node "sudo route del default gw $ADMNET_GW"
+        #juju ssh $node "sudo route del default gw $ADMNET_GW"
     done
 }