Remove no longer used disable_upgrade_deployment flag

In I75f087dc456c50327c3b4ad98a1f89a7e012dc68 we removed much of
the legacy upgrade workflow. This now also removes the
disable_upgrade_deployment flag and the tripleo_upgrade_node.sh
script, both of which are no longer used and have no effect on
the upgrade.

Related reviews
    I7b19c5299d6d60a96a73cafaf0d7103c3bd7939d tripleo-common
    I4227f82168271089ae32cbb1f318d4a84e278cc7 python-tripleoclient

Change-Id: Ib340376ee80ea42a732a51d0c195b048ca0440ac
This commit is contained in:
mandreou 2018-03-29 14:55:14 +03:00
parent 14af18e393
commit 66df6bdb46
20 changed files with 7 additions and 72 deletions

View File

@ -4,9 +4,6 @@
# On upgrade certain roles can be disabled for operator driven upgrades # On upgrade certain roles can be disabled for operator driven upgrades
# See major_upgrade_steps.j2.yaml and post-upgrade.j2.yaml # See major_upgrade_steps.j2.yaml and post-upgrade.j2.yaml
{%- set enabled_roles = roles -%} {%- set enabled_roles = roles -%}
{%- set is_upgrade = false -%}
{%- else %}
{%- set is_upgrade = true -%}
{%- endif -%} {%- endif -%}
{%- set primary_role = [enabled_roles[0]] -%} {%- set primary_role = [enabled_roles[0]] -%}
{%- for role in enabled_roles -%} {%- for role in enabled_roles -%}
@ -268,11 +265,7 @@ resources:
tasks: tasks:
# Join host_prep_tasks with the other per-host configuration # Join host_prep_tasks with the other per-host configuration
list_concat: list_concat:
{%- if is_upgrade|default(false) and role.disable_upgrade_deployment|default(false) %}
- []
{%- else %}
- {get_param: [role_data, {{role.name}}, host_prep_tasks]} - {get_param: [role_data, {{role.name}}, host_prep_tasks]}
{%- endif %}
- -
# FIXME: can we move docker-puppet somewhere so it's installed via a package? # FIXME: can we move docker-puppet somewhere so it's installed via a package?
- name: Create /var/lib/docker-puppet - name: Create /var/lib/docker-puppet

View File

@ -161,7 +161,6 @@
CountDefault: 1 CountDefault: 1
HostnameFormatDefault: '%stackname%-novacompute-%index%' HostnameFormatDefault: '%stackname%-novacompute-%index%'
disable_constraints: True disable_constraints: True
disable_upgrade_deployment: True
networks: networks:
- InternalApi - InternalApi
- Tenant - Tenant
@ -240,7 +239,6 @@
- InternalApi - InternalApi
- Storage - Storage
- StorageMgmt - StorageMgmt
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD
- OS::TripleO::Services::CACerts - OS::TripleO::Services::CACerts

View File

@ -1,43 +0,0 @@
#!/bin/bash
#
# This delivers the operator driven upgrade script to be invoked as part of
# the tripleo major upgrade workflow. The utility 'upgrade-non-controller.sh'
# is used from the undercloud to invoke the /root/tripleo_upgrade_node.sh
#
set -eu
UPGRADE_SCRIPT=/root/tripleo_upgrade_node.sh
cat > $UPGRADE_SCRIPT << ENDOFCAT
### DO NOT MODIFY THIS FILE
### This file is automatically delivered to those nodes where the
### disable_upgrade_deployment flag is set in roles_data.yaml.
set -eu
NOVA_COMPUTE=""
if hiera -c /etc/puppet/hiera.yaml service_names | grep nova_compute ; then
NOVA_COMPUTE="true"
fi
SWIFT_STORAGE=""
if hiera -c /etc/puppet/hiera.yaml service_names | grep swift_storage ; then
SWIFT_STORAGE="true"
fi
DEBUG="true"
SCRIPT_NAME=$(basename $0)
$(declare -f log_debug)
NODE_NAME=\$(cat /etc/hostname)
log_debug "$UPGRADE_SCRIPT has completed on \${NODE_NAME} - moving onto ansible playbooks"
echo "----------------------------------------------------
The TripleO upgrade tasks has completed on \${NODE_NAME}
Moving onto ansible playbooks
----------------------------------------------------"
ENDOFCAT
# ensure the permissions are OK
chmod 0755 $UPGRADE_SCRIPT

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The disable_upgrade_deployment flag is now completely removed from
the roles_data. It will have no effect if you continue to include
this flag. It has not been used since the Pike upgrade. In Queens
the upgrade workflow is delivered with ansible playbooks.

View File

@ -20,7 +20,6 @@
deprecated_param_ips: 'NovaComputeIPs' deprecated_param_ips: 'NovaComputeIPs'
deprecated_server_resource_name: 'NovaCompute' deprecated_server_resource_name: 'NovaCompute'
deprecated_nic_config_name: 'compute.yaml' deprecated_nic_config_name: 'compute.yaml'
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -10,7 +10,6 @@
- Tenant - Tenant
- Storage - Storage
HostnameFormatDefault: '%stackname%-novacomputealt-%index%' HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
disable_upgrade_deployment: True
disable_constraints: True disable_constraints: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -9,7 +9,6 @@
- Tenant - Tenant
- Storage - Storage
- StorageMgmt - StorageMgmt
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -10,7 +10,6 @@
- Tenant - Tenant
- Storage - Storage
HostnameFormatDefault: '%stackname%-novacomputeiha-%index%' HostnameFormatDefault: '%stackname%-novacomputeiha-%index%'
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -10,7 +10,6 @@
- Tenant - Tenant
- Storage - Storage
HostnameFormatDefault: '%stackname%-computeovsdpdk-%index%' HostnameFormatDefault: '%stackname%-computeovsdpdk-%index%'
disable_upgrade_deployment: True
deprecated_nic_config_name: 'compute-dpdk.yaml' deprecated_nic_config_name: 'compute-dpdk.yaml'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide

View File

@ -13,7 +13,6 @@
ImageDefault: overcloud-realtime-compute ImageDefault: overcloud-realtime-compute
RoleParametersDefault: RoleParametersDefault:
TunedProfileName: "realtime-virtual-host" TunedProfileName: "realtime-virtual-host"
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -13,7 +13,6 @@
- Tenant - Tenant
- Storage - Storage
HostnameFormatDefault: '%stackname%-computerealtime-%index%' HostnameFormatDefault: '%stackname%-computerealtime-%index%'
disable_upgrade_deployment: True
ImageDefault: overcloud-realtime-compute ImageDefault: overcloud-realtime-compute
RoleParametersDefault: RoleParametersDefault:
TunedProfileName: "realtime-virtual-host" TunedProfileName: "realtime-virtual-host"

View File

@ -10,7 +10,6 @@
- Tenant - Tenant
- Storage - Storage
HostnameFormatDefault: '%stackname%-computesriov-%index%' HostnameFormatDefault: '%stackname%-computesriov-%index%'
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -10,7 +10,6 @@
- Tenant - Tenant
- Storage - Storage
HostnameFormatDefault: '%stackname%-computesriovrt-%index%' HostnameFormatDefault: '%stackname%-computesriovrt-%index%'
disable_upgrade_deployment: True
ImageDefault: overcloud-realtime-compute ImageDefault: overcloud-realtime-compute
RoleParametersDefault: RoleParametersDefault:
TunedProfileName: "realtime-virtual-host" TunedProfileName: "realtime-virtual-host"

View File

@ -9,7 +9,6 @@
- Tenant - Tenant
- Storage - Storage
- StorageMgmt - StorageMgmt
disable_upgrade_deployment: True
HostnameFormatDefault: '%stackname%-hci-ceph-all-%index%' HostnameFormatDefault: '%stackname%-hci-ceph-all-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide

View File

@ -9,7 +9,6 @@
- Tenant - Tenant
- Storage - Storage
- StorageMgmt - StorageMgmt
disable_upgrade_deployment: True
HostnameFormatDefault: '%stackname%-hci-ceph-file-%index%' HostnameFormatDefault: '%stackname%-hci-ceph-file-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide

View File

@ -9,7 +9,6 @@
- Tenant - Tenant
- Storage - Storage
- StorageMgmt - StorageMgmt
disable_upgrade_deployment: True
HostnameFormatDefault: '%stackname%-hci-ceph-mon-%index%' HostnameFormatDefault: '%stackname%-hci-ceph-mon-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide

View File

@ -9,7 +9,6 @@
- Tenant - Tenant
- Storage - Storage
- StorageMgmt - StorageMgmt
disable_upgrade_deployment: True
HostnameFormatDefault: '%stackname%-hci-ceph-object-%index%' HostnameFormatDefault: '%stackname%-hci-ceph-object-%index%'
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide

View File

@ -16,7 +16,6 @@
deprecated_param_image: 'SwiftStorageImage' deprecated_param_image: 'SwiftStorageImage'
deprecated_param_flavor: 'OvercloudSwiftStorageFlavor' deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
deprecated_nic_config_name: 'swift-storage.yaml' deprecated_nic_config_name: 'swift-storage.yaml'
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD

View File

@ -47,10 +47,6 @@ Role Options
* disable_constraints: (boolean) optional, whether to disable Nova and Glance * disable_constraints: (boolean) optional, whether to disable Nova and Glance
constraints for each role specified in the templates. constraints for each role specified in the templates.
* disable_upgrade_deployment: (boolean) optional, whether to run the
ansible upgrade steps for all services that are deployed on the role. If set
to True, the operator will drive the upgrade for this role's nodes.
* upgrade_batch_size: (number): batch size for upgrades where tasks are * upgrade_batch_size: (number): batch size for upgrades where tasks are
specified by services to run in batches vs all nodes at once. specified by services to run in batches vs all nodes at once.
This defaults to 1, but larger batches may be specified here. This defaults to 1, but larger batches may be specified here.

View File

@ -195,7 +195,6 @@
deprecated_param_ips: 'NovaComputeIPs' deprecated_param_ips: 'NovaComputeIPs'
deprecated_server_resource_name: 'NovaCompute' deprecated_server_resource_name: 'NovaCompute'
deprecated_nic_config_name: 'compute.yaml' deprecated_nic_config_name: 'compute.yaml'
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD
@ -298,7 +297,6 @@
deprecated_param_image: 'SwiftStorageImage' deprecated_param_image: 'SwiftStorageImage'
deprecated_param_flavor: 'OvercloudSwiftStorageFlavor' deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
deprecated_nic_config_name: 'swift-storage.yaml' deprecated_nic_config_name: 'swift-storage.yaml'
disable_upgrade_deployment: True
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::Aide - OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD - OS::TripleO::Services::AuditD