Merge "Add featureset for Heat convergence job"

This commit is contained in:
Jenkins 2017-07-13 03:20:34 +00:00 committed by Gerrit Code Review
commit 34ecff2c4d
2 changed files with 115 additions and 51 deletions

View File

@ -0,0 +1,60 @@
# Summary of the feature set.
# Deploy an Openstack environment with ssl undercloud, introspect, and use network isolation
# This enables TLS for the undercloud which will also make haproxy bind to the
# configured public-vip and admin-vip.
undercloud_generate_service_certificate: true
ssl_overcloud: true
overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
step_introspect: true
undercloud_heat_convergence: true
# Tell tripleo about our environment.
enable_pacemaker: true
network_isolation: true
network_isolation_type: "multiple-nics"
network_isolation_args: >-
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-isolation-absolute.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/network-templates/network-environment.yaml
-e {{ tripleo_root }}/tripleo-ci/test-environments/net-iso.yaml
# This featureset is extremely resource intensive, so we disable telemetry
# in order to reduce the overall memory footprint
# This is not required in newton
telemetry_args: >-
{% if release != 'newton' %}
-e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
{% endif %}
extra_args: >-
--ntp-server pool.ntp.org
test_ping: true
run_tempest: false
tempest_config: false
# keep the doc gen settings at the bottom of the config file.
# options below direct automatic doc generation by tripleo-collect-logs
artcl_gen_docs: true
artcl_create_docs_payload:
included_deployment_scripts:
- undercloud-install
- overcloud-custom-tht-script
- overcloud-prep-flavors
- overcloud-prep-images
- overcloud-prep-network
- overcloud-deploy
- overcloud-deploy-post
- overcloud-validate
included_static_docs:
- env-setup-virt
table_of_contents:
- env-setup-virt
- undercloud-install
- overcloud-custom-tht-script
- overcloud-prep-flavors
- overcloud-prep-images
- overcloud-prep-network
- overcloud-deploy
- overcloud-deploy-post
- overcloud-validate

View File

@ -17,57 +17,59 @@ A definition of the services can be found
Below is a table with various features listed in each row and the features enabled Below is a table with various features listed in each row and the features enabled
in each feature set configuration file in each column. in each feature set configuration file in each column.
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| FS | ipv6 | SSL UC | SSL OC | NI SN | NI MN | NI BOND | introsp | UC idem | cont UC | cont OC | cont upg | ping | tempest | sc001 | sc002 | sc003 | sc004 | sc005 | sc006 | nonha | ceph | | FS | ipv6 | SSL UC | SSL OC | NI SN | NI MN | NI BOND | introsp | UC idem | cont UC | cont OC | cont upg | ping | tempest | sc001 | sc002 | sc003 | sc004 | sc005 | sc006 | nonha | ceph | HC |
+=====+======+========+========+=======+=======+=========+=========+=========+=========+=========+==========+======+=========+=======+=======+=======+=======+=======+=======+========+======+ +=====+======+========+========+=======+=======+=========+=========+=========+=========+=========+==========+======+=========+=======+=======+=======+=======+=======+=======+========+======+====+
| 001 | | X | X | | X | | X | | | | | X | | | | | | | | | | | 001 | | X | X | | X | | X | | | | | X | | | | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 002 | | X | X | | X | | X | | | | | X | | | | | | | | | | | 002 | | X | X | | X | | X | | | | | X | | | | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 003 | | | | | | | | X | | | | | | | | | | | | | | | 003 | | | | | | | | X | | | | | | | | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 004 | | | | | | | | | | | | | | | | | | | | X | | | 004 | | | | | | | | | | | | | | | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 005 | | | | | | | | | | | | X | | X | | | | | | | | | 005 | | | | | | | | | | | | X | | X | | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 006 | | | | | | | | | | | | X | | | X | | | | | | | | 006 | | | | | | | | | | | | X | | | X | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 007 | | | | | | | | | | | | X | | | | X | | | | | | | 007 | | | | | | | | | | | | X | | | | X | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 008 | | | | | | | | | | | | X | | | | | X | | | | | | 008 | | | | | | | | | | | | X | | | | | X | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 009 | | | | | | | | | | | | X | | | | | | X | X | | | | 009 | | | | | | | | | | | | X | | | | | | X | X | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 010 | | | | | | | | | | X | | | | | | | | | | X | | | 010 | | | | | | | | | | X | | | | | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 011 | | | | | | | | | | | X | | | | | | | | | X | | | 011 | | | | | | | | | | | X | | | | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 012 | | | | | | | | | | | X | | | X | | | | | | X | | | 012 | | | | | | | | | | | X | | | X | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 013 | | | | | | | | | | | X | | | | X | | | | | X | | | 013 | | | | | | | | | | | X | | | | X | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 014 | | | | | | | | | | | X | | | | | X | | | | X | | | 014 | | | | | | | | | | | X | | | | | X | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 015 | | | | | | | | | | | X | | | | | | X | | | X | | | 015 | | | | | | | | | | | X | | | | | | X | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 016 | | | | | | | | | | X | | | | X | | | | | | X | | | 016 | | | | | | | | | | X | | | | X | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 017 | | | | | | | | | | X | | | | | X | | | | | X | | | 017 | | | | | | | | | | X | | | | | X | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 018 | | | | | | | | | | X | | | | | | X | | | | X | | | 018 | | | | | | | | | | X | | | | | | X | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 019 | | | | | | | | | | X | | | | | | | X | | | X | | | 019 | | | | | | | | | | X | | | | | | | X | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 020 | | | | | | | | | | | | | X | | | | | | | X | | | 020 | | | | | | | | | | | | | X | | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 021 | | X | X | | X | | X | | | | | | X | | | | | | | | | | 021 | | X | X | | X | | X | | | | | | X | | | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 022 | | X | | | | | X | | | X | | X | | | | | | | | X | | | 022 | | X | | | | | X | | | X | | X | | | | | | | | X | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 024 | X | X | | | X | | X | | | | | X | | | | | | | | | X | | 024 | X | X | | | X | | X | | | | | X | | | | | | | | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 026 | | | | | | | | | | X | | | | | | | | | X | | | | 025 | | X | X | | X | | X | | | | | X | | | | | | | | | | X |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+----------------++------+------+ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+-------+-------+--------+------+----+
| 026 | | | | | | | | | | X | | | | | | | | | X | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+------+---------+-------+-------+-------+-------+----------------++------+------+----+
Definition of Terms: Definition of Terms:
@ -96,3 +98,5 @@ Definition of Terms:
+--------------+-------------------------------------------------------------------+ +--------------+-------------------------------------------------------------------+
| sc<number> | scenario | | sc<number> | scenario |
+--------------+-------------------------------------------------------------------+ +--------------+-------------------------------------------------------------------+
| HC | Heat Convergence is enabled |
+--------------+-------------------------------------------------------------------+