From 7445fc3cb73440d34350c4fdae84a75a1832cd08 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Tue, 8 May 2018 10:02:01 +0200 Subject: [PATCH] Clean up upgrades/updates featureset. Once [0] got merged, there is no chance that the overcloud-upgrade role will run. Upgrade job have all been moved to use the new tripleo-upgrade, so we can dispense all overcloud-upgrade related variables from the featuresets. [0] - Iaf30244187d27909ab803175843056e0827d0b24 Change-Id: Ibe715cc4f604ba554db8dd4ab2d95391e4b1f311 --- config/general_config/featureset011.yml | 9 +-------- config/general_config/featureset012.yml | 8 -------- config/general_config/featureset013.yml | 8 -------- config/general_config/featureset014.yml | 8 -------- config/general_config/featureset015.yml | 8 -------- config/general_config/featureset037.yml | 3 ++- config/general_config/featureset040.yml | 10 ++-------- config/general_config/featureset051.yml | 10 ++-------- .../tripleo-ci/pike-undercloud-ocata-overcloud.yml | 5 +++++ 9 files changed, 12 insertions(+), 57 deletions(-) diff --git a/config/general_config/featureset011.yml b/config/general_config/featureset011.yml index 5bc39e294..7de90e576 100644 --- a/config/general_config/featureset011.yml +++ b/config/general_config/featureset011.yml @@ -11,17 +11,9 @@ overcloud_ipv6: false # 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 doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates" -overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates -overcloud_templates_branch: stable/{{ overcloud_release }} undercloud_generate_service_certificate: false @@ -36,6 +28,7 @@ upgrade_composable_scenario: multinode-containers.yaml deployed_server: true # Tripleo_upgrade role parameters +# Major Ugrade: baremetal -> containers undercloud_upgrade: false overcloud_upgrade: true tht_directory: "/usr/share/openstack-tripleo-heat-templates" diff --git a/config/general_config/featureset012.yml b/config/general_config/featureset012.yml index e96c410b8..a49a785ee 100644 --- a/config/general_config/featureset012.yml +++ b/config/general_config/featureset012.yml @@ -15,17 +15,9 @@ enable_opstools_repo: true # 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 doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates" -overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates -overcloud_templates_branch: stable/{{ overcloud_release }} undercloud_generate_service_certificate: false diff --git a/config/general_config/featureset013.yml b/config/general_config/featureset013.yml index d32c4c262..4151ff91a 100644 --- a/config/general_config/featureset013.yml +++ b/config/general_config/featureset013.yml @@ -13,17 +13,9 @@ overcloud_ipv6: false # 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 doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates" -overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates -overcloud_templates_branch: stable/{{ overcloud_release }} undercloud_generate_service_certificate: false diff --git a/config/general_config/featureset014.yml b/config/general_config/featureset014.yml index 0425236bd..4034f8a71 100644 --- a/config/general_config/featureset014.yml +++ b/config/general_config/featureset014.yml @@ -13,17 +13,9 @@ overcloud_ipv6: false # 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 doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates" -overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates -overcloud_templates_branch: stable/{{ overcloud_release }} undercloud_generate_service_certificate: false diff --git a/config/general_config/featureset015.yml b/config/general_config/featureset015.yml index 8aa2232be..4dbc72f61 100644 --- a/config/general_config/featureset015.yml +++ b/config/general_config/featureset015.yml @@ -13,17 +13,9 @@ overcloud_ipv6: false # 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 doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates" -overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates -overcloud_templates_branch: stable/{{ overcloud_release }} undercloud_generate_service_certificate: false diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml index 5b2b642ce..bff4ab23a 100644 --- a/config/general_config/featureset037.yml +++ b/config/general_config/featureset037.yml @@ -3,7 +3,8 @@ composable_scenario: scenario000-multinode-containers.yaml -# tripleo-upgrade role variables +# Tripleo-upgrade role parameters +# Minor Update overcloud_update: true # NOTE: right now the container images stay the same before and # after update. This makes the job run fast while still testing diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml index f09a79d84..4345e2759 100644 --- a/config/general_config/featureset040.yml +++ b/config/general_config/featureset040.yml @@ -27,26 +27,20 @@ test_ping: false run_tempest: true # save time by doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -# Tripleo-upgrade link +# Tripleo-upgrade role parameters +# Major Upgrade: containers -> containers overcloud_upgrade: true - # disable tripleo-upgrade container manipulation. create_docker_registry: false use_local_docker_registry: false create_container_images_download_script: false - container_registry_file: "containers-default-parameters.yaml" - tripleo_ci: true use_oooq: true - tripleo_upgrade_debug: true overcloud_ssh_user: "tripleo-admin" - # Mandatory for deployed_servers tripleo_upgrade_validations_non_fatal: true # Reduce CI wall time diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml index 2f42fac3c..d1b9a8f0e 100644 --- a/config/general_config/featureset051.yml +++ b/config/general_config/featureset051.yml @@ -28,26 +28,20 @@ test_ping: false run_tempest: false # save time by doing a mixed upgrade -step_pre_undercloud_upgrade: true -step_upgrade_undercloud: false mixed_upgrade: true -# Tripleo-upgrade link +# Tripleo-upgrade role parameters +# Major Upgrade: containers -> containers (keystone-only) overcloud_upgrade: true - # disable tripleo-upgrade container manipulation. create_docker_registry: false use_local_docker_registry: false create_container_images_download_script: false - container_registry_file: "containers-default-parameters.yaml" - tripleo_ci: true use_oooq: true - tripleo_upgrade_debug: true overcloud_ssh_user: "tripleo-admin" - # Mandatory for deployed_servers tripleo_upgrade_validations_non_fatal: true # Reduce CI wall time diff --git a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml index b5aae8ee3..04c5a6a85 100644 --- a/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml +++ b/config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml @@ -9,6 +9,11 @@ docker_registry_host: docker.io docker_registry_namespace: tripleopike docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" docker_ceph_tag: v3.0.3-stable-3.0-jewel-centos-7-x86_64 + +overcloud_templates_path: "{{ working_dir }}/tripleo-heat-templates" +overcloud_templates_repo: https://git.openstack.org/openstack/tripleo-heat-templates +overcloud_templates_branch: stable/{{ overcloud_release }} + undercloud_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/undercloud.qcow2 ipa_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar overcloud_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/overcloud-full.tar