adding bionic support.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index 5f3b5e8..1ad45fb 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@ -1,5 +1,7 @@
 # vim: set ts=2 et:
   series: {{ ubuntu.release }}
+  variables:
+{% include 'spaces.yaml' %}
   services:
 {% if os.hyperconverged %}
     nodes:
@@ -8,14 +10,16 @@
 {% else %}
     nodes:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
+      series: {{ ubuntu.release }}
 {% if os.ha.mode == 'ha' %}
       num_units: 3
 {% else %}
       num_units: 1
 {% endif %}
-      constraints: tags=control
+
     nodes-compute:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
+      series: {{ ubuntu.release }}
 {% if os.ha.mode == 'ha' %}
       num_units: {{ opnfv.units - 3 }}
 {% else %}
@@ -24,13 +28,13 @@
 {% endif %}
     ntp:
       charm: "./{{ ubuntu.release }}/ntp"
+      series: {{ ubuntu.release }}
 {% if os.network.controller == 'ocl' %}
       options:
         source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
         auto_peers: false
 {% endif %}
 {% include 'mysql.yaml' %}
-{% include 'ceilometer.yaml' %}
 {% if opnfv.storage_dict.scaleio is defined %}
 {% include 'scaleio.yaml' %}
 {% else %}
@@ -54,9 +58,13 @@
 {% include 'nova-compute.yaml' %}
 {% include 'openstack-dashboard.yaml' %}
 {% include 'rabbitmq.yaml' %}
-{% include 'heat.yaml' %}
 {% include 'neutron-api.yaml' %}
+{% include 'heat.yaml' %}
+{% include 'designate.yaml' %}
+{% if os.network.controller != 'ocl' %}
 {% include 'neutron-gateway.yaml' %}
+{% include 'ceilometer.yaml' %}
+{% endif %}
 {% include 'aodh.yaml' %}
 {% if os.network.controller == 'odl' %}
 {% include 'odl.yaml' %}
@@ -83,6 +91,3 @@
 {% include 'harelations.yaml' %}
 {% endif %}
 {% include 'relations.yaml' %}
-{% if os.mano.mode == 'ha' %}
-{% include 'harelations.yaml' %}
-{% endif %}