From d7321f8223363ac26878a22d1fd1f04c201732fe Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 7 Oct 2016 08:28:53 -0500 Subject: enabling heat cluster for experiment. Change-Id: Id8192abb141596a2b6b5144447985f02d74b513f Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/ceph.yaml | 9 +++++ ci/config_tpl/bundle_tpl/cinder.yaml | 10 ++++-- ci/config_tpl/bundle_tpl/glance.yaml | 6 ++++ ci/config_tpl/bundle_tpl/haclusters.yaml | 40 +++++++++++++++++++--- ci/config_tpl/bundle_tpl/harelations.yaml | 2 +- ci/config_tpl/bundle_tpl/heat.yaml | 9 +++-- ci/config_tpl/bundle_tpl/keystone.yaml | 5 +++ ci/config_tpl/bundle_tpl/mysql.yaml | 3 ++ ci/config_tpl/bundle_tpl/neutron-api.yaml | 6 ++++ .../bundle_tpl/nova-cloud-controller.yaml | 6 ++++ ci/config_tpl/bundle_tpl/nova-compute.yaml | 6 ++++ ci/config_tpl/bundle_tpl/openstack-dashboard.yaml | 3 ++ ci/config_tpl/bundle_tpl/phase2-overrides.yaml | 8 ++--- ci/config_tpl/bundle_tpl/rabbitmq.yaml | 3 ++ ci/config_tpl/bundle_tpl/subordinate.yaml | 3 ++ 15 files changed, 104 insertions(+), 15 deletions(-) (limited to 'ci/config_tpl') diff --git a/ci/config_tpl/bundle_tpl/ceph.yaml b/ci/config_tpl/bundle_tpl/ceph.yaml index faddbc35..53fa5df4 100644 --- a/ci/config_tpl/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/bundle_tpl/ceph.yaml @@ -6,6 +6,9 @@ monitor-count: {{ unit_ceph_qty() }} fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if opnfv.spaces_dict.storage is defined %} #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }} {% endif %} @@ -35,6 +38,9 @@ options: osd-devices: {{ opnfv.storage_dict.ceph.disk }} osd-reformat: 'yes' +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} to: {% if os.hyperconverged %} {% for unit_id in range(0, opnfv.units) %} @@ -58,6 +64,9 @@ region: {{ os.region }} use-embedded-webserver: true operator-roles: "Member,admin" +{% 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 %} diff --git a/ci/config_tpl/bundle_tpl/cinder.yaml b/ci/config_tpl/bundle_tpl/cinder.yaml index bf3fb04c..dee6be08 100644 --- a/ci/config_tpl/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/bundle_tpl/cinder.yaml @@ -8,6 +8,14 @@ options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} + block-device: None + glance-api-version: 2 +{% if os.beta.public_api %} + use-internal-endpoints: true +{% endif %} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} @@ -20,8 +28,6 @@ {% if os.beta.public_api %} os-public-hostname: api.{{ opnfv.domain }} {% endif %} - block-device: None - glance-api-version: 2 to: {% if opnfv.storage_dict.scaleio is defined %} - "nodes=0" diff --git a/ci/config_tpl/bundle_tpl/glance.yaml b/ci/config_tpl/bundle_tpl/glance.yaml index 6c884465..7ae7fcc7 100644 --- a/ci/config_tpl/bundle_tpl/glance.yaml +++ b/ci/config_tpl/bundle_tpl/glance.yaml @@ -4,6 +4,12 @@ options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} +{% 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 %} diff --git a/ci/config_tpl/bundle_tpl/haclusters.yaml b/ci/config_tpl/bundle_tpl/haclusters.yaml index fc42d38e..59493d5f 100644 --- a/ci/config_tpl/bundle_tpl/haclusters.yaml +++ b/ci/config_tpl/bundle_tpl/haclusters.yaml @@ -4,50 +4,80 @@ options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-cinder: charm: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 -# hacluster-heat: -# charm: "local:{{ ubuntu.release }}/hacluster" -# options: -# corosync_transport: unicast -# cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} + hacluster-heat: + charm: "local:{{ ubuntu.release }}/hacluster" + options: + corosync_transport: unicast + cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-horizon: charm: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-nova: charm: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-neutron: charm: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-glance: charm: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-ceilometer: charm: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} hacluster-mysql: charm: "local:{{ ubuntu.release }}/hacluster" 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: "local:{{ ubuntu.release }}/hacluster" options: corosync_transport: unicast cluster_count: 3 +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/harelations.yaml b/ci/config_tpl/bundle_tpl/harelations.yaml index d4c4c064..e7bac9a2 100644 --- a/ci/config_tpl/bundle_tpl/harelations.yaml +++ b/ci/config_tpl/bundle_tpl/harelations.yaml @@ -1,7 +1,7 @@ {% if os.ha.mode == 'ha' %} - [ 'mysql:ha', 'hacluster-mysql:ha' ] - [ 'cinder:ha', 'hacluster-cinder:ha' ] -# - [ 'heat:ha', 'hacluster-heat:ha' ] + - [ 'heat:ha', 'hacluster-heat:ha' ] - [ 'glance:ha', 'hacluster-glance:ha' ] - [ 'keystone:ha', 'hacluster-keystone:ha' ] - [ 'neutron-api:ha', 'hacluster-neutron:ha' ] diff --git a/ci/config_tpl/bundle_tpl/heat.yaml b/ci/config_tpl/bundle_tpl/heat.yaml index 58d039d8..929981e3 100644 --- a/ci/config_tpl/bundle_tpl/heat.yaml +++ b/ci/config_tpl/bundle_tpl/heat.yaml @@ -1,20 +1,23 @@ heat: charm: "local:{{ ubuntu.release }}/heat" -# num_units: {{ unit_qty() }} + num_units: {{ unit_qty() }} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} {% if os.ha.mode == 'ha' %} -# vip: {{ opnfv.vip.heat }} + vip: {{ opnfv.vip.heat }} {% endif %} {% if os.beta.public_api %} # os-public-hostname: api.{{ opnfv.domain }} {% endif %} to: {% for unit_id in to_select() %} - - "lxc:nodes=0" + - "lxc:nodes={{ unit_id }}" {% endfor %} {# Empty block to avoid bad block trim #} diff --git a/ci/config_tpl/bundle_tpl/keystone.yaml b/ci/config_tpl/bundle_tpl/keystone.yaml index d8c778c3..22d422cf 100644 --- a/ci/config_tpl/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/bundle_tpl/keystone.yaml @@ -4,6 +4,11 @@ options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} + admin-role: {{ os.admin.role }} + keystone-admin-role: {{ os.admin.role }} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/mysql.yaml b/ci/config_tpl/bundle_tpl/mysql.yaml index afa45193..ab2c4934 100644 --- a/ci/config_tpl/bundle_tpl/mysql.yaml +++ b/ci/config_tpl/bundle_tpl/mysql.yaml @@ -10,6 +10,9 @@ max-connections: 20000 root-password: {{ get_password('mysql_root') }} sst-password: {{ get_password('mysql_sst') }} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.mysql }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/neutron-api.yaml b/ci/config_tpl/bundle_tpl/neutron-api.yaml index 0ae0a97d..f7523e7b 100644 --- a/ci/config_tpl/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/bundle_tpl/neutron-api.yaml @@ -5,6 +5,12 @@ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} neutron-security-groups: true +{% if os.beta.public_api %} + use-internal-endpoints: true +{% endif %} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml index 38aa7d32..c3f809bb 100644 --- a/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml +++ b/ci/config_tpl/bundle_tpl/nova-cloud-controller.yaml @@ -7,6 +7,12 @@ #console-access-protocol: novnc neutron-external-network: ext-net service-guard: true +{% if os.beta.public_api %} + use-internal-endpoints: true +{% endif %} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/nova-compute.yaml b/ci/config_tpl/bundle_tpl/nova-compute.yaml index 456ac417..d331332d 100644 --- a/ci/config_tpl/bundle_tpl/nova-compute.yaml +++ b/ci/config_tpl/bundle_tpl/nova-compute.yaml @@ -14,6 +14,12 @@ 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 %} diff --git a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml index db83d5bf..43d8ef26 100644 --- a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml @@ -5,6 +5,9 @@ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" secret: admin webroot: / +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.dashboard }} {% endif %} diff --git a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml index 12b8905a..a8dbd400 100644 --- a/ci/config_tpl/bundle_tpl/phase2-overrides.yaml +++ b/ci/config_tpl/bundle_tpl/phase2-overrides.yaml @@ -2,7 +2,7 @@ #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }} {% endif %} {% if os.network.ipv6 %} - prefer-ipv6: {{ os.network.ipv6 }} + #prefer-ipv6: {{ os.network.ipv6 }} {% endif %} {% if os.ha.mode == 'ha' %} {% if os.api.haproxy_timeout %} @@ -34,8 +34,8 @@ #ceph-osd-replication-count: {{ unit_ceph_qty() }} {% endif %} {% endif %} - admin-role: {{ os.admin.role }} - keystone-admin-role: {{ os.admin.role }} + #admin-role: {{ os.admin.role }} + #keystone-admin-role: {{ os.admin.role }} {% if os.beta.public_api %} - use-internal-endpoints: true + #use-internal-endpoints: true {% endif %} diff --git a/ci/config_tpl/bundle_tpl/rabbitmq.yaml b/ci/config_tpl/bundle_tpl/rabbitmq.yaml index 17d764d3..f7c27c1d 100644 --- a/ci/config_tpl/bundle_tpl/rabbitmq.yaml +++ b/ci/config_tpl/bundle_tpl/rabbitmq.yaml @@ -5,6 +5,9 @@ {% if opnfv.storage_dict.ceph is defined %} ceph-osd-replication-count: {{ unit_ceph_qty() }} {% endif %} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.rabbitmq }} min-cluster-size: {{ unit_qty() }} diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml index 3f043dc1..4107d80b 100644 --- a/ci/config_tpl/bundle_tpl/subordinate.yaml +++ b/ci/config_tpl/bundle_tpl/subordinate.yaml @@ -2,6 +2,9 @@ charm: local:{{ ubuntu.release }}/ceilometer-agent options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if os.beta.public_api %} + use-internal-endpoints: true +{% endif %} {% if opnfv.storage_dict.ceph is defined %} cinder-ceph: charm: local:{{ ubuntu.release }}/cinder-ceph -- cgit 1.2.3-korg