From 8bddfd342a9b53d823625445d5aff9111ae203b4 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Mon, 11 Sep 2017 15:29:19 -0400 Subject: [PATCH] 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 --- config/general_config/featureset005.yml | 3 +++ config/general_config/featureset006.yml | 3 +++ config/general_config/featureset007.yml | 3 +++ config/general_config/featureset008.yml | 3 +++ config/general_config/featureset009.yml | 3 +++ config/general_config/featureset012.yml | 4 +++- config/general_config/featureset013.yml | 4 +++- config/general_config/featureset014.yml | 4 +++- config/general_config/featureset015.yml | 4 +++- config/general_config/featureset016.yml | 4 +++- config/general_config/featureset017.yml | 4 +++- config/general_config/featureset018.yml | 4 +++- config/general_config/featureset019.yml | 4 +++- doc/source/feature-configuration.rst | 30 ++++++++++++------------- 14 files changed, 54 insertions(+), 23 deletions(-) diff --git a/config/general_config/featureset005.yml b/config/general_config/featureset005.yml index 222e7961d..64c8fe6de 100644 --- a/config/general_config/featureset005.yml +++ b/config/general_config/featureset005.yml @@ -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 diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml index 6dad4e1e3..607559712 100644 --- a/config/general_config/featureset006.yml +++ b/config/general_config/featureset006.yml @@ -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 diff --git a/config/general_config/featureset007.yml b/config/general_config/featureset007.yml index 81a7154ea..c4bd70231 100644 --- a/config/general_config/featureset007.yml +++ b/config/general_config/featureset007.yml @@ -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 diff --git a/config/general_config/featureset008.yml b/config/general_config/featureset008.yml index 0c3b94aa8..894f5da6d 100644 --- a/config/general_config/featureset008.yml +++ b/config/general_config/featureset008.yml @@ -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 diff --git a/config/general_config/featureset009.yml b/config/general_config/featureset009.yml index e7ff2eae9..426ffe13c 100644 --- a/config/general_config/featureset009.yml +++ b/config/general_config/featureset009.yml @@ -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 diff --git a/config/general_config/featureset012.yml b/config/general_config/featureset012.yml index 0d416d4f7..059ac4c3d 100644 --- a/config/general_config/featureset012.yml +++ b/config/general_config/featureset012.yml @@ -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 diff --git a/config/general_config/featureset013.yml b/config/general_config/featureset013.yml index 2dd0b101d..c929ac4b5 100644 --- a/config/general_config/featureset013.yml +++ b/config/general_config/featureset013.yml @@ -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 diff --git a/config/general_config/featureset014.yml b/config/general_config/featureset014.yml index 6803bd88a..c70d73399 100644 --- a/config/general_config/featureset014.yml +++ b/config/general_config/featureset014.yml @@ -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 diff --git a/config/general_config/featureset015.yml b/config/general_config/featureset015.yml index 7ce469caa..44e619cf7 100644 --- a/config/general_config/featureset015.yml +++ b/config/general_config/featureset015.yml @@ -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 diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index 32d56bc0d..21dd061d3 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -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 diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index 1e8788a61..ccd2253e6 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -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 diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index d8844b760..fe7a4c624 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -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 diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index df300cb45..2a8f71e16 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -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 diff --git a/doc/source/feature-configuration.rst b/doc/source/feature-configuration.rst index 03707b7fe..64309a6c0 100644 --- a/doc/source/feature-configuration.rst +++ b/doc/source/feature-configuration.rst @@ -19,7 +19,7 @@ in each feature set configuration file in each column. When adding new configura please consult the following `etherpad `_ +-----+------+--------+--------+-------+-------+---------+---------+---------+---------+---------+----------+-------------+------+---------+-------+-------+-------+-------+-------+-------+-------+-------+--------+------+----+----+ -| 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 | scenario | +--------------+-------------------------------------------------------------------+ -| HA | Multiple controllers with pacemaker enabled | +| PM | pacemaker enabled, topology determines the number of controllers | +--------------+-------------------------------------------------------------------+ | HC | Heat Convergence is enabled | +--------------+-------------------------------------------------------------------+