From bab0f87196cac8d0830014e497990841e529fc98 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Thu, 8 Feb 2018 18:48:35 -0500 Subject: [PATCH] remove deployed_server from common args deployed_server is no longer common through out the multinode featuresets. deploy_steps_ansible_workflow is an alternative now. Related-Bug: #1748315 Change-Id: I28988d30338527669da25bc764143cf57a995af9 --- config/general_config/featureset-multinode-common.yml | 1 - config/general_config/featureset005.yml | 1 + config/general_config/featureset006.yml | 1 + config/general_config/featureset007.yml | 1 + config/general_config/featureset008.yml | 1 + config/general_config/featureset009.yml | 1 + config/general_config/featureset010.yml | 6 ++++++ config/general_config/featureset011.yml | 1 + config/general_config/featureset012.yml | 1 + config/general_config/featureset013.yml | 1 + config/general_config/featureset014.yml | 1 + config/general_config/featureset015.yml | 1 + config/general_config/featureset016.yml | 1 + config/general_config/featureset017.yml | 1 + config/general_config/featureset018.yml | 1 + config/general_config/featureset019.yml | 1 + 16 files changed, 20 insertions(+), 1 deletion(-) diff --git a/config/general_config/featureset-multinode-common.yml b/config/general_config/featureset-multinode-common.yml index 537c6d93b..a1d23c231 100644 --- a/config/general_config/featureset-multinode-common.yml +++ b/config/general_config/featureset-multinode-common.yml @@ -6,7 +6,6 @@ step_overcloud_image: false step_glance_upload: true step_register: false hypervisor_wait: false -deployed_server: true network_isolation: false package_installs: true non_root_user_setup: true diff --git a/config/general_config/featureset005.yml b/config/general_config/featureset005.yml index 215394eea..63eac25d8 100644 --- a/config/general_config/featureset005.yml +++ b/config/general_config/featureset005.yml @@ -31,6 +31,7 @@ run_tripleo_validations_negative_tests: True # Exit tripleo-quickstart on validations failure exit_on_validations_failure: False +deployed_server: true composable_scenario: scenario001-multinode.yaml composable_roles: true overcloud_roles: diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml index eb0862d98..a01e3ce0d 100644 --- a/config/general_config/featureset006.yml +++ b/config/general_config/featureset006.yml @@ -11,6 +11,7 @@ exit_on_validations_failure: False # pacemaker settings are configured in the scenario template # do not set `enable_pacemaker` in the featureset +deployed_server: true composable_scenario: scenario002-multinode.yaml validate_template: scenario002-multinode.yaml composable_roles: true diff --git a/config/general_config/featureset007.yml b/config/general_config/featureset007.yml index e41c7905f..bf3b6937a 100644 --- a/config/general_config/featureset007.yml +++ b/config/general_config/featureset007.yml @@ -11,6 +11,7 @@ exit_on_validations_failure: False # pacemaker settings are configured in the scenario template # do not set `enable_pacemaker` in the featureset +deployed_server: true composable_scenario: scenario003-multinode.yaml validate_template: scenario003-multinode.yaml composable_roles: true diff --git a/config/general_config/featureset008.yml b/config/general_config/featureset008.yml index d2ed82d7d..e22611617 100644 --- a/config/general_config/featureset008.yml +++ b/config/general_config/featureset008.yml @@ -11,6 +11,7 @@ exit_on_validations_failure: False # pacemaker settings are configured in the scenario template # do not set `enable_pacemaker` in the featureset +deployed_server: true composable_scenario: scenario004-multinode.yaml validate_template: scenario004-multinode.yaml composable_roles: true diff --git a/config/general_config/featureset009.yml b/config/general_config/featureset009.yml index 46965410d..1bea55b0d 100644 --- a/config/general_config/featureset009.yml +++ b/config/general_config/featureset009.yml @@ -4,6 +4,7 @@ test_ping: true # pacemaker settings are configured in the scenario template # do not set `enable_pacemaker` in the featureset +deployed_server: true composable_scenario: scenario005-multinode.yaml validate_template: scenario005-multinode.yaml composable_roles: true diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml index f39ded248..c006f698f 100644 --- a/config/general_config/featureset010.yml +++ b/config/general_config/featureset010.yml @@ -40,6 +40,12 @@ overcloud_roles: - StorageMgmt - Tenant +deployed_server: >- + {% if release in ['newton','ocata','pike'] -%} + true + {%- else -%} + false + {%- endif -%} deploy_steps_ansible_workflow: >- {% if release not in ['newton','ocata','pike'] -%} true diff --git a/config/general_config/featureset011.yml b/config/general_config/featureset011.yml index 58740be7a..13ef92473 100644 --- a/config/general_config/featureset011.yml +++ b/config/general_config/featureset011.yml @@ -33,6 +33,7 @@ step_introspect: false composable_scenario: multinode.yaml upgrade_composable_scenario: multinode-containers.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset012.yml b/config/general_config/featureset012.yml index 20962f01f..e96c410b8 100644 --- a/config/general_config/featureset012.yml +++ b/config/general_config/featureset012.yml @@ -38,6 +38,7 @@ step_introspect: false composable_scenario: scenario001-multinode.yaml upgrade_composable_scenario: scenario001-multinode-containers.yaml validate_template: scenario001-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset013.yml b/config/general_config/featureset013.yml index f06a9a2ee..d32c4c262 100644 --- a/config/general_config/featureset013.yml +++ b/config/general_config/featureset013.yml @@ -36,6 +36,7 @@ step_introspect: false composable_scenario: scenario002-multinode.yaml upgrade_composable_scenario: scenario002-multinode-containers.yaml validate_template: scenario002-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset014.yml b/config/general_config/featureset014.yml index 08874879e..0425236bd 100644 --- a/config/general_config/featureset014.yml +++ b/config/general_config/featureset014.yml @@ -36,6 +36,7 @@ step_introspect: false composable_scenario: scenario003-multinode.yaml upgrade_composable_scenario: scenario003-multinode-containers.yaml validate_template: scenario003-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset015.yml b/config/general_config/featureset015.yml index 527f6e13f..8aa2232be 100644 --- a/config/general_config/featureset015.yml +++ b/config/general_config/featureset015.yml @@ -36,6 +36,7 @@ step_introspect: false composable_scenario: scenario004-multinode.yaml upgrade_composable_scenario: scenario004-multinode-containers.yaml validate_template: scenario004-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index 9646fad27..985910176 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -19,6 +19,7 @@ step_introspect: false composable_scenario: scenario001-multinode-containers.yaml validate_template: scenario001-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index 61cc08572..0226bb419 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -17,6 +17,7 @@ step_introspect: false composable_scenario: scenario002-multinode-containers.yaml validate_template: scenario002-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index 02875cd45..0c8bee358 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -17,6 +17,7 @@ step_introspect: false composable_scenario: scenario003-multinode-containers.yaml validate_template: scenario003-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index 000b4bd5d..b536c3532 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -17,6 +17,7 @@ step_introspect: false composable_scenario: scenario004-multinode-containers.yaml validate_template: scenario004-multinode.yaml +deployed_server: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true