From 14e5779a53ff29cf4045c490a08b028535e2f62e Mon Sep 17 00:00:00 2001 From: Attila Darazs Date: Tue, 27 Jun 2017 13:09:46 +0200 Subject: [PATCH] Add missing deploy_composable_scenario variable The "deploy_composable_scenario: true" variable was missing from our scenario based featuresets, which was masked by an override in our upstream testing, but results in missing the scenario files when trying to reproduce them with the featureset configs only. Change-Id: I7e7c13b9151607233f1159ed91c455dcec37e230 --- config/general_config/featureset005.yml | 2 +- config/general_config/featureset006.yml | 2 +- config/general_config/featureset007.yml | 2 +- config/general_config/featureset008.yml | 2 +- config/general_config/featureset009.yml | 2 +- config/general_config/featureset016.yml | 6 +++--- config/general_config/featureset017.yml | 6 +++--- config/general_config/featureset018.yml | 6 +++--- config/general_config/featureset019.yml | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/general_config/featureset005.yml b/config/general_config/featureset005.yml index 6c3ff19b9..0e7503961 100644 --- a/config/general_config/featureset005.yml +++ b/config/general_config/featureset005.yml @@ -2,6 +2,6 @@ undercloud_generate_service_certificate: false enable_opstools_repo: true test_ping: true +deploy_composable_scenario: true composable_scenario: scenario001-multinode.yaml validate_template: scenario001-multinode.yaml - diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml index db44b46ec..b09814604 100644 --- a/config/general_config/featureset006.yml +++ b/config/general_config/featureset006.yml @@ -1,6 +1,6 @@ undercloud_generate_service_certificate: false test_ping: true +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 48829e7f4..0d7c10888 100644 --- a/config/general_config/featureset007.yml +++ b/config/general_config/featureset007.yml @@ -1,6 +1,6 @@ undercloud_generate_service_certificate: false test_ping: true +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 248820d60..f572fe415 100644 --- a/config/general_config/featureset008.yml +++ b/config/general_config/featureset008.yml @@ -1,6 +1,6 @@ undercloud_generate_service_certificate: false test_ping: true +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 f22f6aac7..c5aeed289 100644 --- a/config/general_config/featureset009.yml +++ b/config/general_config/featureset009.yml @@ -1,6 +1,6 @@ undercloud_generate_service_certificate: false test_ping: true +deploy_composable_scenario: true composable_scenario: scenario005-multinode.yaml validate_template: scenario005-multinode.yaml - diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index 8606409df..6497d01be 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -1,6 +1,5 @@ -# Summary of the feature set. -# Deploy an Openstack environment with a non-containerized overcloud, -# and upgrade it to a containerized overcloud. +# Deploy an Openstack environment with a containerized overcloud +# using scenario001 undercloud_setup: true network_isolation: false @@ -20,6 +19,7 @@ test_ping: false run_tempest: false step_introspect: false +deploy_composable_scenario: true composable_scenario: scenario001-multinode-containers.yaml # options below direct automatic doc generation by tripleo-collect-logs diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index ed9c61759..acb0599a8 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -1,6 +1,5 @@ -# Summary of the feature set. -# Deploy an Openstack environment with a non-containerized overcloud, -# and upgrade it to a containerized overcloud. +# Deploy an Openstack environment with a containerized overcloud +# using scenario002 undercloud_setup: true network_isolation: false @@ -20,6 +19,7 @@ test_ping: false run_tempest: false step_introspect: false +deploy_composable_scenario: true composable_scenario: scenario002-multinode-containers.yaml # options below direct automatic doc generation by tripleo-collect-logs diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index ac9d9bbec..be58b0853 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -1,6 +1,5 @@ -# Summary of the feature set. -# Deploy an Openstack environment with a non-containerized overcloud, -# and upgrade it to a containerized overcloud. +# Deploy an Openstack environment with a containerized overcloud +# using scenario003 undercloud_setup: true network_isolation: false @@ -20,6 +19,7 @@ test_ping: false run_tempest: false step_introspect: false +deploy_composable_scenario: true composable_scenario: scenario003-multinode-containers.yaml # options below direct automatic doc generation by tripleo-collect-logs diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index 37e398fed..2c9bd8b90 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -1,6 +1,5 @@ -# Summary of the feature set. -# Deploy an Openstack environment with a non-containerized overcloud, -# and upgrade it to a containerized overcloud. +# Deploy an Openstack environment with a containerized overcloud +# using scenario004 undercloud_setup: true network_isolation: false @@ -20,6 +19,7 @@ test_ping: false run_tempest: false step_introspect: false +deploy_composable_scenario: true composable_scenario: scenario004-multinode-containers.yaml # options below direct automatic doc generation by tripleo-collect-logs