From e9a56336b664f4575194c2317aa747652a2ecb6f Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 15 Aug 2017 13:28:22 -0500
Subject: modified templates and added variable to easlity understand the
 templates and added support for multiple networks.

Change-Id: I1074c722c9007bd12c711dbfc58afa1a098d2a17
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml')

diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index 92be0418..6e7fa7ec 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -1,24 +1,18 @@
     neutron-openvswitch:
       charm: ./{{ ubuntu.release }}/neutron-openvswitch
 {% if os.service.bindings %}
-{% if opnfv.spaces_dict.data is defined %}
       bindings:
-        data: tenant-data
+        data: *overlay-space
       options:
 {% else %}
-      bindings:
-        data: internal-api
       options:
-{% endif %}
-{% else %}
-      options:
-{% if os.git_repo.origin_git %}
-        openstack-origin-git: "{{ os.git_repo.branch }}"
-{% endif %}
 {% if opnfv.spaces_dict.data is defined %}
         os-data-network: {{ opnfv.spaces_dict.data.cidr }}
 {% endif %}
 {% endif %}
+{% if os.git_repo.origin_git %}
+        openstack-origin-git: "{{ os.git_repo.branch }}"
+{% endif %}
 {% if os.network.dpdk %}
         enable-dpdk: true
         #dpdk-driver: uio_pci_generic
@@ -26,17 +20,10 @@
         #default-socket-memory: 1024
         #default-socket-cores: 1
 {% endif %}
-{% if opnfv.ext_port is defined  %}
 {% if os.network.controller == 'nosdn' %}
-{% if opnfv.data_port is defined  %}
-        bridge-mappings: physnet1:br-ex physnet2:br-data
-        data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }}
-{% else %}
-        bridge-mappings: physnet1:br-ex
-        data-port: br-ex:{{ opnfv.ext_port }}
-{% endif %}
+        bridge-mappings: physnet1:br-data
+        #data-port: *data-port
 {% else %}
         ext-port: {{ opnfv.ext_port }}
 {% endif %}
-{% endif %}
 {# Empty block to avoid bad block trim #}
-- 
cgit 1.2.3-korg