adding bionic support.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / odl.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
index 2be64b1..b38d92d 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml
@@ -3,22 +3,13 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        shared-db: internal-api
-        internal: internal-api
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin-api
-{% else %}
-        admin: internal-api
-{% endif %}
-{% else %}
-        admin: internal-api
-        public: internal-api
-{% endif %}
+        "": *oam-space
+        controller-api: *internal-space
+        ovsdb-manager: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
-        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.2-Boron-SR2/distribution-karaf-0.5.2-Boron-SR2.tar.gz"
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz"
 {% if os.network.sfc %}
         profile: "openvswitch-odl-beryllium-sfc"
 {% elif os.network.bgpvpn %}