From: zhangyuanyou <zhangyuanyou@huawei.com>
Date: Wed, 20 Jan 2016 09:50:45 +0000 (+0800)
Subject: need to use onosfw neutron-gateway.
X-Git-Tag: colorado.1.0~299
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F7411%2F1;p=joid.git

need to use onosfw neutron-gateway.

Change-Id: I13caa239bd264367cd5116cab40db2e553795b15
---

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"