summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangyuanyou <zhangyuanyou@huawei.com>2016-06-22 20:35:24 +0800
committerzhangyuanyou <zhangyuanyou@huawei.com>2016-06-22 20:36:56 +0800
commit23433fd66f713c97a5465ac2f9e240bc9da9bb4e (patch)
tree3ac5ce6743e6eda5e862887eacd6e6cc002c0df3
parente00e92d2e9c1f33fe23e65169c475ba8cd6ab0ee (diff)
fix onos charms for xenial.
Change-Id: Ifc47864d874f3a7cbd395eac20ff5a68cfb32be9 Signed-off-by: Yuanyou Zhang <zhangyuanyou@huawei.com>
-rwxr-xr-xci/onos/fetch-charms.sh10
-rwxr-xr-xci/openstack.sh2
2 files changed, 6 insertions, 6 deletions
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
}