openstack
/
tripleo-quickstart
Code Issues Proposed changes

Add featureset011 - upgrade from BM to containerized 

This featureset deploys a non-containerized overcloud first, and then
upgrades it to a containerized one.

Change-Id: Ia013fe331d84adce7d36af6bd4e33d37c0755fdd
This commit is contained in:
Jiri Stransky 2017-03-27 17:35:42 +02:00
parent 2f3c9bb11f
commit 25e76f5cc0
2 changed files with 104 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
config/general_config/featureset011.yml Normal file
View File

@ -0,0 +1,61 @@
# Summary of the feature set.
# Deploy an Openstack environment with a non-containerized overcloud,
# and upgrade it to a containerized overcloud.
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
# we're upgrading from non-containers to containers, so first we
# deploy non-containerized overcloud
containerized_overcloud: false
containerized_overcloud_upgrade: true
major_upgrade_script: major-upgrade-overcloud-containers.sh.j2
upgrade_undercloud_repo_script: upgrade-repo-tripleo-ci.sh.j2
upgrade_overcloud_repo_template: overcloud-repo-tripleo-ci.yaml.j2
# save time by not upgrading undercloud in CI
step_pre_undercloud_upgrade: false
step_upgrade_undercloud: false
undercloud_generate_service_certificate: false
ssl_overcloud: false
tempest_config: false
# TODO: enable pingtest when the job passes with some time left
# before the time limit
test_ping: false
run_tempest: false
step_introspect: false
composable_scenario: multinode-container-upgrade.yaml
# options below direct automatic doc generation by tripleo-collect-logs
artcl_gen_docs: true
artcl_create_docs_payload:
included_deployment_scripts:
- undercloud-install
- overcloud-custom-tht-script
- overcloud-prep-containers
- overcloud-prep-flavors
- overcloud-prep-images
- overcloud-prep-network
- overcloud-deploy
- overcloud-deploy-post
- overcloud-upgrade
- overcloud-validate
included_static_docs:
- env-setup-virt
table_of_contents:
- env-setup-virt
- undercloud-install
- overcloud-custom-tht-script
- overcloud-prep-containers
- overcloud-prep-flavors
- overcloud-prep-images
- overcloud-prep-network
- overcloud-deploy
- overcloud-deploy-post
- overcloud-upgrade
- overcloud-validate

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

@ -17,41 +17,47 @@ A definition of the services can be found
Below is a table with various features listed in each row and the features enabled
in each feature set configuration file in each column.
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| Feature | set001 | set002 | set003 | set004 | set005 | set006 | set007 | set008 | set009 |
+=================+========+========+========+========+========+========+========+========+========+
| ipv6 | | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| SSL UC | X | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| SSL OC | X | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso SN | | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso MN | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso BOND | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| introspection | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| undercloud idem | | | X | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ping test | X | X | | | X | X | X | X | X |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| tempest | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario001 | | | | | X | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario002 | | | | | | X | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario003 | | | | | | | X | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario004 | | | | | | | | X | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario005 | | | | | | | | | X |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| multinode-nonha | | | | X | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| Feature | set001 | set002 | set003 | set004 | set005 | set006 | set007 | set008 | set009 | set011 |
+=================+========+========+========+========+========+========+========+========+========+========+
| ipv6 | | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| SSL UC | X | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| SSL OC | X | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso SN | | X | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso MN | X | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| net iso BOND | | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| introspection | X | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| undercloud idem | | | X | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| container UC | | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| container OC | | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| container upg | | | | | | | | | | X |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| ping test | X | X | | | X | X | X | X | X | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| tempest | | | | | | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario001 | | | | | X | | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario002 | | | | | | X | | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario003 | | | | | | | X | | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario004 | | | | | | | | X | | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| scenario005 | | | | | | | | | X | |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| multinode-nonha | | | | X | | | | | | X |
+-----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
Definition of Terms:
@ -72,3 +78,5 @@ Definition of Terms:
+--------------+-------------------------------------------------------------------+
| idem | idempotency test |
+--------------+-------------------------------------------------------------------+
| upg | major upgrade |
+--------------+-------------------------------------------------------------------+