adding bionic support.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/congress.yaml b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
index 4800e58..a96951a 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
@@ -3,21 +3,15 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal-api
-        shared-db: internal-api
-{% if opnfv.spaces_dict.data is defined %}
-        admin: admin-api
-{% else %}
-        admin: internal-api
-{% endif %}
-{% if opnfv.spaces_dict.public is defined %}
-        public: public-api
-{% else %}
-        public: internal-api
-{% endif %}
+        "": *oam-space
+        internal: *internal-space
+        admin: *admin-space
+        shared-db: *internal-space
+        public: *public-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
-        region: {{ os.region }}
+        region: *openstack-region
 {% if ubuntu.release == 'trusty' %}
         source-branch: "stable/{{ os.release  }}"
 {% endif %}