adding bionic support.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
index 26ea286..79efb3f 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
@@ -1,6 +1,7 @@
 
     hacluster-keystone:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -9,6 +10,7 @@
 {% endif %}
     hacluster-cinder:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -17,6 +19,7 @@
 {% endif %}
     hacluster-heat:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -25,6 +28,7 @@
 {% endif %}
     hacluster-horizon:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -33,6 +37,7 @@
 {% endif %}
     hacluster-nova:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -41,6 +46,7 @@
 {% endif %}
     hacluster-neutron:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -49,6 +55,7 @@
 {% endif %}
     hacluster-glance:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -58,6 +65,7 @@
 {% if os.network.controller != 'ocl' %}
     hacluster-ceilometer:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
@@ -67,19 +75,46 @@
 {% endif %}
     hacluster-mysql:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
-{% if os.beta.hacluster_ceph_radosgw %}
     hacluster-ceph-radosgw:
       charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
       options:
         corosync_transport: unicast
         cluster_count: 3
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
+    hacluster-aodh:
+      charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
+    hacluster-gnocchi:
+      charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
+    hacluster-designate:
+      charm: "./{{ ubuntu.release }}/hacluster"
+      series: {{ ubuntu.release }}
+      options:
+        corosync_transport: unicast
+        cluster_count: 3
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}