adding bionic support.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / nova-compute.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
index 66d5385..93c9770 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml
@@ -1,7 +1,11 @@
     nova-compute:
       charm: "./{{ ubuntu.release }}/nova-compute"
 {% if os.hyperconverged %}
+{% if os.ha.mode == 'ha' %}
+      num_units: {{ opnfv.units - 2 }}
+{% else %}
       num_units: {{ opnfv.units - 1 }}
+{% endif %}
 {% else %}
 {% if os.ha.mode == 'ha' %}
       num_units: {{ opnfv.units - 3 }}
@@ -9,17 +13,18 @@
       num_units: {{ opnfv.units - 1 }}
 {% endif %}
 {% endif %}
+      bindings:
+        "": *oam-space
+        internal: *internal-space
+      series: {{ ubuntu.release }}
       options:
-        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
         openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
-        enable-live-migration: true
-        enable-resize: true
+        enable-live-migration: True
+        enable-resize: True
         migration-auth-type: ssh
-{% if os.beta.public_api %}
-        use-internal-endpoints: true
-{% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
@@ -34,12 +39,20 @@
 {% endif %}
 {% if os.lxd %}
         virt-type: lxd
+{% else %}
+        virt-type: kvm
 {% endif %}
       to:
 {% if os.hyperconverged %}
+{% if os.ha.mode == 'ha' %}
+{% for unit_id in range(2, opnfv.units) %}
+        - "nodes/{{ unit_id }}"
+{% endfor %}
+{% else %}
 {% for unit_id in range(1, opnfv.units) %}
         - "nodes/{{ unit_id }}"
 {% endfor %}
+{% endif %}
 {% else %}
 {% if os.ha.mode == 'ha' %}
 {% for unit_id in range(0, opnfv.units - 3) %}