From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 10 Feb 2017 17:59:02 +0000 (-0600)
Subject: fix the ODL deployment.
X-Git-Tag: danube.1.0~45
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3add42efb7e43db0cc770563d3ecc32ccb493ccd;p=joid.git

fix the ODL deployment.

Change-Id: I37127878afac245d7281e1bcebbe22af11fc9710
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 330961b6..015130b7 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -25,6 +25,9 @@
     openvswitch-odl:
       charm: ./{{ ubuntu.release }}/openvswitch-odl
       options:
++{% if opnfv.ext_port is defined  %}
++        provider_mappings: "physnet1:{{ opnfv.ext_port }}"
++{% endif %}
 {% if opnfv.spaces_dict.data is defined %}
         os-data-network: {{ opnfv.spaces_dict.data.cidr }}
 {% endif %}
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index f1b2ecb9..84209f42 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -13,7 +13,7 @@ function build {
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
 bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
-bzr branch lp:~narindergupta/opnfv/neutron-gateway $distro/neutron-gateway
+charm pull cs:~narindergupta/charm-neutron-gateway-0 $distro/neutron-gateway
 
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
@@ -65,4 +65,4 @@ charm pull cs:$distro/aodh $distro/aodh
 #odl controller specific charm
 charm pull cs:$distro/odl-controller $distro/odl-controller
 charm pull cs:$distro/neutron-api-odl $distro/neutron-api-odl
-charm pull cs:$distro/openvswitch-odl $distro/openvswitch-odl
+charm pull cs:~narindergupta/openvswitch-odl-1 $distro/openvswitch-odl