adding bionic support.

[joid.git] / 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 7eb0253..eae8e4e 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -1,11 +1,18 @@
     neutron-openvswitch:
       charm: ./{{ ubuntu.release }}/neutron-openvswitch
-      options:
-{% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
       bindings:
-        data: admin
+        data: *overlay-space
+      series: {{ ubuntu.release }}
+      options:
+{% else %}
+      options:
+{% 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
@@ -14,17 +21,11 @@
         #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 }}
+        bridge-mappings: physnet1:br-data
+        data-port: *data-port
+        #enable-local-dhcp-and-metadata: true
 {% else %}
-        bridge-mappings: physnet1:br-ex
-        data-port: br-ex:{{ opnfv.ext_port }}
-{% endif %}
-{% else %}
-         ext-port: {{ opnfv.ext_port }}
-{% endif %}
+        ext-port: {{ opnfv.ext_port }}
 {% endif %}
 {# Empty block to avoid bad block trim #}