diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-23 07:30:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-23 07:30:54 +0000 |
| commit | 8b789671698a9e7b262a5e7875d7a016c52bbcdf (patch) | |
| tree | b8bc5ceba57b392a2482c6c51a23116a01ab2858 | |
| parent | a7e0222655f1944a8ab5a642839f23d45e70324e (diff) | |
| parent | 23433fd66f713c97a5465ac2f9e240bc9da9bb4e (diff) | |
Merge "fix onos charms for xenial."
| -rwxr-xr-x | ci/onos/fetch-charms.sh | 10 | ||||
| -rwxr-xr-x | ci/openstack.sh | 2 |
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 2da729f6..c9e2752f 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 } |