summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangyuanyou <zhangyuanyou@huawei.com>2016-01-20 17:50:45 +0800
committerzhangyuanyou <zhangyuanyou@huawei.com>2016-01-20 17:50:45 +0800
commitc997be21fbaaa9d63a28041090a977763bb032e0 (patch)
tree125eb6364788d9c6127454a6d9805ce0f65c7ac0
parent530c6ecfe188a4ec06eb6ddfbba8d8934bd0cc3d (diff)
need to use onosfw neutron-gateway.
Change-Id: I13caa239bd264367cd5116cab40db2e553795b15
-rw-r--r--ci/onos/juju-deployer/ovs-onos-nonha.yaml2
-rw-r--r--ci/onos/juju-deployer/ovs-onos-tip.yaml4
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 51598f81..32055774 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -136,7 +136,7 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-gateway:
- branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+ branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
# "ext-port": "eth1"
plugin: onos
diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index a71c7401..c1164ceb 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -137,11 +137,11 @@ openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-gateway:
- branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
+ branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
openstack-origin-git: include-file://neutron-master.yaml
# "ext-port": "eth1"
- plugin: ovs-onos
+ plugin: onos
instance-mtu: 1400
to:
- "nodes-api=0"