From f1dfc0776d32dea2a2fe7e2cb2b15b1836a6b666 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sun, 16 Oct 2016 07:54:56 -0500 Subject: cmodfiied to add juju 2.0 support. Change-Id: I3981f796cfb9ceb9f32522f4fed831d66e389c48 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml (limited to '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 new file mode 100644 index 00000000..88c12b0c --- /dev/null +++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml @@ -0,0 +1,47 @@ + nova-compute: + charm: "./{{ ubuntu.release }}/nova-compute" +{% if os.hyperconverged %} + num_units: {{ opnfv.units - 1 }} +{% else %} +{% if os.ha.mode == 'ha' %} + num_units: {{ opnfv.units - 3 }} +{% else %} + num_units: {{ opnfv.units - 1 }} +{% endif %} +{% endif %} + options: + openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" + 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 %} +{% if opnfv.storage_dict.ceph is defined %} + ceph-osd-replication-count: {{ unit_ceph_qty() }} +{% endif %} +{% if os.beta.huge_pages %} + hugepages: "50%" +{% endif %} +{% if os.lxd %} + virt-type: lxd +{% endif %} + to: +{% if os.hyperconverged %} +{% for unit_id in range(1, opnfv.units) %} + - "nodes/{{ unit_id }}" +{% endfor %} +{% else %} +{% if os.ha.mode == 'ha' %} +{% for unit_id in range(0, opnfv.units - 3) %} + - "nodes-compute/{{ unit_id }}" +{% endfor %} +{% else %} +{% for unit_id in range(0, opnfv.units - 1) %} + - "nodes-compute/{{ unit_id }}" +{% endfor %} +{% endif %} +{% endif %} -- cgit 1.2.3-korg