openstack
/
tripleo-quickstart
Code Issues Proposed changes

scenario templates deploy with pacemaker 

You will notice that all the scenario jobs
have pacemaker enabled, so there is no need
to try and set it with tq. See the following
https://github.com/openstack/tripleo-heat-templates/blob/master/README.rst#service-testing-matrix

Depends-On: Iece70e22cd40cb119f2f9eb3c51be7bd4631fade
Change-Id: Icd3b103aefce382f2a15adff77896cb4dcb2c2a0
This commit is contained in:
Wes Hayutin 2017-09-11 15:29:19 -04:00 committed by Emilien Macchi
parent 54ddb52213
commit 8bddfd342a
14 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/general_config/featureset005.yml
View File

@ -4,6 +4,9 @@ enable_opstools_repo: true
# Use the traditional ping test in newton and ocata
# Run tempest in pike+
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
test_ping: >-
{% if release in ['newton', 'ocata'] -%}
true

3
config/general_config/featureset006.yml
View File

@ -8,6 +8,9 @@ run_tripleo_validations_negative_tests: True
# Exit tripleo-quickstart on validations failure
exit_on_validations_failure: False
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
deploy_composable_scenario: true
composable_scenario: scenario002-multinode.yaml
validate_template: scenario002-multinode.yaml

3
config/general_config/featureset007.yml
View File

@ -8,6 +8,9 @@ run_tripleo_validations_negative_tests: True
# Exit tripleo-quickstart on validations failure
exit_on_validations_failure: False
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
deploy_composable_scenario: true
composable_scenario: scenario003-multinode.yaml
validate_template: scenario003-multinode.yaml

3
config/general_config/featureset008.yml
View File

@ -8,6 +8,9 @@ run_tripleo_validations_negative_tests: True
# Exit tripleo-quickstart on validations failure
exit_on_validations_failure: False
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
deploy_composable_scenario: true
composable_scenario: scenario004-multinode.yaml
validate_template: scenario004-multinode.yaml

3
config/general_config/featureset009.yml
View File

@ -1,6 +1,9 @@
undercloud_generate_service_certificate: false
test_ping: true
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
deploy_composable_scenario: true
composable_scenario: scenario005-multinode.yaml
validate_template: scenario005-multinode.yaml

4
config/general_config/featureset012.yml
View File

@ -4,9 +4,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
enable_opstools_repo: true
# we're upgrading from non-containers to containers, so first we

4
config/general_config/featureset013.yml
View File

@ -4,9 +4,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
# we're upgrading from non-containers to containers, so first we
# deploy non-containerized overcloud
containerized_overcloud: false

4
config/general_config/featureset014.yml
View File

@ -4,9 +4,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
# we're upgrading from non-containers to containers, so first we
# deploy non-containerized overcloud
containerized_overcloud: false

4
config/general_config/featureset015.yml
View File

@ -4,9 +4,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
# we're upgrading from non-containers to containers, so first we
# deploy non-containerized overcloud
containerized_overcloud: false

4
config/general_config/featureset016.yml
View File

@ -3,9 +3,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
enable_opstools_repo: true
containerized_overcloud: true

4
config/general_config/featureset017.yml
View File

@ -3,9 +3,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
containerized_overcloud: true
undercloud_generate_service_certificate: false

4
config/general_config/featureset018.yml
View File

@ -3,9 +3,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
containerized_overcloud: true
undercloud_generate_service_certificate: false

4
config/general_config/featureset019.yml
View File

@ -3,9 +3,11 @@
undercloud_setup: true
network_isolation: false
enable_pacemaker: true
overcloud_ipv6: false
# pacemaker settings are configured in the scenario template
# do not set `enable_pacemaker` in the featureset
containerized_overcloud: true
undercloud_generate_service_certificate: false

30
doc/source/feature-configuration.rst
View File

@ -19,7 +19,7 @@ in each feature set configuration file in each column. When adding new configura
please consult the following `etherpad <https://etherpad.openstack.org/p/quickstart-featuresets>`_
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| FS | ipv6 | SSL UC | SSL OC | NI SN | NI MN | NI BOND | introsp | UC idem | cont UC | cont OC | cont upg | validations | ping | tempest | sc001 | sc002 | sc003 | sc004 | sc005 | sc006 | sc007 | sc008 |nonha | ceph | HA | HC |
| FS | ipv6 | SSL UC | SSL OC | NI SN | NI MN | NI BOND | introsp | UC idem | cont UC | cont OC | cont upg | validations | ping | tempest | sc001 | sc002 | sc003 | sc004 | sc005 | sc006 | sc007 | sc008 |nonha | ceph | PM | HC |
+=====+======+========+========+=======+=======+=========+=========+=========+=========+=========+==========+=============+======+=========+=======+=======+=======+=======+=======+=======+=======+=======+========+======+====+====+
| 001 | | X | X | | X | | X | | | | | | X | | | | | | | | | | | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
@ -29,35 +29,35 @@ please consult the following `etherpad <https://etherpad.openstack.org/p/quickst
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 004 | | | | | | | | | | | | X | | | | | | | | | | | X | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 005 | | | | | | | | | | | | X | X | | X | | | | | | | | | | | |
| 005 | | | | | | | | | | | | X | X | | X | | | | | | | | | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 006 | | | | | | | | | | | | X | | X | | X | | | | | | | | | | |
| 006 | | | | | | | | | | | | X | | X | | X | | | | | | | | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 007 | | | | | | | | | | | | X | | X | | | X | | | | | | | | | |
| 007 | | | | | | | | | | | | X | | X | | | X | | | | | | | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 008 | | | | | | | | | | | | X | | X | | | | X | | | | | | | | |
| 008 | | | | | | | | | | | | X | | X | | | | X | | | | | | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 009 | | | | | | | | | | | | | X | | | | | | X | X | | | | | | |
| 009 | | | | | | | | | | | | | X | | | | | | X | | | | | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 010 | | | | | | | | | | X | | | | X | | | | | | | | | X | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 011 | | | | | | | | | | | X | | X | | | | | | | | | | X | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 012 | | | | | | | | | | | X | | X | | X | | | | | | | | X | | | |
| 012 | | | | | | | | | | | X | | X | | X | | | | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 013 | | | | | | | | | | | X | | X | | | X | | | | | | | X | | | |
| 013 | | | | | | | | | | | X | | X | | | X | | | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 014 | | | | | | | | | | | X | | X | | | | X | | | | | | X | | | |
| 014 | | | | | | | | | | | X | | X | | | | X | | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 015 | | | | | | | | | | | X | | X | | | | | X | | | | | X | | | |
| 015 | | | | | | | | | | | X | | X | | | | | X | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 016 | | | | | | | | | | X | | | | X | X | | | | | | | | X | | | |
| 016 | | | | | | | | | | X | | | | X | X | | | | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 017 | | | | | | | | | | X | | | | X | | X | | | | | | | X | | | |
| 017 | | | | | | | | | | X | | | | X | | X | | | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 018 | | | | | | | | | | X | | | | X | | | X | | | | | | X | | | |
| 018 | | | | | | | | | | X | | | | X | | | X | | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 019 | | | | | | | | | | X | | | | X | | | | X | | | | | X | | | |
| 019 | | | | | | | | | | X | | | | X | | | | X | | | | | X | | X | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
| 020 | | | | | | | | | | | | | | X | | | | | | | | | X | | | |
+-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+
@ -109,7 +109,7 @@ Definition of Terms:
+--------------+-------------------------------------------------------------------+
| sc<number> | scenario |
+--------------+-------------------------------------------------------------------+
| HA | Multiple controllers with pacemaker enabled |
| PM | pacemaker enabled, topology determines the number of controllers |
+--------------+-------------------------------------------------------------------+
| HC | Heat Convergence is enabled |
+--------------+-------------------------------------------------------------------+