openstack
/
tripleo-quickstart
Code Issues Proposed changes

Use different variables for deploy and upgrade scenarios 

Use the new upgrade_composable_scenario variable from oooq-extra to set
the composable scenario file used during upgrade.

Closes-Bug: #1714905

Change-Id: Ie0e8de54794a9259c0aeb8c67ae0f6a908844093
This commit is contained in:
Martin André 2017-09-04 14:40:07 +02:00 committed by Emilien Macchi
parent b45f0bb5fd
commit cbeb7b84f0
23 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/general_config/composable_upgrade.yml
View File

@ -31,8 +31,8 @@ ssl_overcloud: false
test_ping: false
run_tempest: false
enable_pacemaker: false
deploy_composable_scenario: true
composable_scenario: multinode_major_upgrade.yaml
upgrade_composable_scenario: multinode_major_upgrade.yaml
overcloud_release: newton
overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates"
download_overcloud_templates_rpm: true
@ -40,8 +40,7 @@ download_overcloud_templates_rpm: true
# Upgrade required templates
upgrade_custom_templates_script_delivery:
- overcloud-repo.yaml
upgrade_custom_templates:
- "{{ overcloud_templates_path }}/ci/environments/{{ composable_scenario }}"
upgrade_custom_templates: {}
use_git_tht_repo: true
download_overcloud_image: true

5
config/general_config/composable_upgrade_ovb.yml
View File

@ -28,8 +28,8 @@ public_net_pool_start: 10.0.0.50
public_net_pool_end: 10.0.0.100
public_net_gateway: 10.0.0.1
deploy_composable_scenario: true
composable_scenario: multinode_major_upgrade.yaml
upgrade_composable_scenario: multinode_major_upgrade.yaml
overcloud_release: newton
overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates"
download_overcloud_templates_rpm: true
@ -37,8 +37,7 @@ download_overcloud_templates_rpm: true
# Upgrade required templates
upgrade_custom_templates_script_delivery:
- overcloud-repo.yaml
upgrade_custom_templates:
- "{{ overcloud_templates_path }}/ci/environments/{{ composable_scenario }}"
upgrade_custom_templates: {}
use_git_tht_repo: true
download_overcloud_image: true

3
config/general_config/featureset004.yml
View File

@ -10,9 +10,8 @@ run_tripleo_validations_negative_tests: True
# Exit tripleo-quickstart on validations failure
exit_on_validations_failure: False
deploy_composable_scenario: true
composable_services: false
composable_scenario: multinode.yaml
composable_services: false
# Use default test template
# validate_template: tenantvm-floatingip.yaml

1
config/general_config/featureset005.yml
View File

@ -41,7 +41,6 @@ run_tripleo_validations_negative_tests: True
# Exit tripleo-quickstart on validations failure
exit_on_validations_failure: False
deploy_composable_scenario: true
composable_scenario: scenario001-multinode.yaml
composable_roles: true
overcloud_roles:

1
config/general_config/featureset006.yml
View File

@ -11,7 +11,6 @@ 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
composable_roles: true

1
config/general_config/featureset007.yml
View File

@ -11,7 +11,6 @@ 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
composable_roles: true

1
config/general_config/featureset008.yml
View File

@ -11,7 +11,6 @@ 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
composable_roles: true

1
config/general_config/featureset009.yml
View File

@ -4,7 +4,6 @@ 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
composable_roles: true

1
config/general_config/featureset010.yml
View File

@ -1,4 +1,3 @@
deploy_composable_scenario: true
composable_scenario: multinode-containers.yaml
composable_services: false

4
config/general_config/featureset011.yml
View File

@ -32,8 +32,8 @@ test_ping: true
run_tempest: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: multinode-containers.yaml
composable_scenario: multinode.yaml
upgrade_composable_scenario: multinode-containers.yaml
# options below direct automatic doc generation by tripleo-collect-logs
artcl_gen_docs: true

4
config/general_config/featureset012.yml
View File

@ -36,8 +36,8 @@ test_ping: true
run_tempest: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario001-multinode-containers.yaml
composable_scenario: scenario001-multinode.yaml
upgrade_composable_scenario: scenario001-multinode-containers.yaml
validate_template: scenario001-multinode.yaml
# options below direct automatic doc generation by tripleo-collect-logs

4
config/general_config/featureset013.yml
View File

@ -34,8 +34,8 @@ test_ping: true
run_tempest: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario002-multinode-containers.yaml
composable_scenario: scenario002-multinode.yaml
upgrade_composable_scenario: scenario002-multinode-containers.yaml
validate_template: scenario002-multinode.yaml
# options below direct automatic doc generation by tripleo-collect-logs

4
config/general_config/featureset014.yml
View File

@ -34,8 +34,8 @@ test_ping: true
run_tempest: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario003-multinode-containers.yaml
composable_scenario: scenario003-multinode.yaml
upgrade_composable_scenario: scenario003-multinode-containers.yaml
validate_template: scenario003-multinode.yaml
# options below direct automatic doc generation by tripleo-collect-logs

4
config/general_config/featureset015.yml
View File

@ -34,8 +34,8 @@ test_ping: true
run_tempest: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario004-multinode-containers.yaml
composable_scenario: scenario004-multinode.yaml
upgrade_composable_scenario: scenario004-multinode-containers.yaml
validate_template: scenario004-multinode.yaml
# options below direct automatic doc generation by tripleo-collect-logs

1
config/general_config/featureset016.yml
View File

@ -17,7 +17,6 @@ ssl_overcloud: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario001-multinode-containers.yaml
validate_template: scenario001-multinode.yaml

1
config/general_config/featureset017.yml
View File

@ -15,7 +15,6 @@ ssl_overcloud: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario002-multinode-containers.yaml
validate_template: scenario002-multinode.yaml

1
config/general_config/featureset018.yml
View File

@ -15,7 +15,6 @@ ssl_overcloud: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario003-multinode-containers.yaml
validate_template: scenario003-multinode.yaml

1
config/general_config/featureset019.yml
View File

@ -15,7 +15,6 @@ ssl_overcloud: false
step_introspect: false
deploy_composable_scenario: true
composable_scenario: scenario004-multinode-containers.yaml
validate_template: scenario004-multinode.yaml

1
config/general_config/featureset026.yml
View File

@ -1,4 +1,3 @@
deploy_composable_scenario: true
composable_scenario: scenario006-multinode.yaml
network_isolation: false

1
config/general_config/featureset028.yml
View File

@ -1,6 +1,5 @@
# Summary of the feature set.
# Deploy an Openstack environment with OVN configured in the overcloud
deploy_composable_scenario: true
composable_scenario: scenario007-multinode.yaml
validate_template: scenario007-multinode.yaml

1
config/general_config/featureset030.yml
View File

@ -1,6 +1,5 @@
# Summary of the feature set.
# Deploy an Openstack environment with OVN configured in the containerized overcloud
deploy_composable_scenario: true
composable_scenario: scenario007-multinode-containers.yaml
validate_template: scenario007-multinode.yaml

1
config/general_config/featureset031.yml
View File

@ -1,6 +1,5 @@
# Summary of the feature set.
# Deploy an Openstack environment with opnfv configured in the overcloud
deploy_composable_scenario: true
composable_scenario: scenario008-multinode.yaml
validate_template: scenario008-multinode.yaml
composable_roles: true

3
config/general_config/featureset032.yml
View File

@ -6,7 +6,8 @@ ssl_overcloud: false
test_ping: true
# Note(trown): overriding the key these set, so setting them to false
deploy_composable_scenario: false
composable_scenario: ""
upgrade_composable_scenario: ""
composable_services: false
composable_roles: false