openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove no longer used disable_upgrade_deployment flag"

Browse Source
This commit is contained in:
Zuul 2018-04-03 05:30:26 +00:00 committed by Gerrit Code Review
commit 8fd00675e8
20 changed files with 7 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/deploy-steps.j2
View File

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

2
deployed-server/deployed-server-roles-data.yaml
View File

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

43
extraconfig/tasks/tripleo_upgrade_node.sh
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

7
releasenotes/notes/remove_disable_upgrade_deployment_flag-872df40d7ff171b8.yaml Normal file
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.

1
roles/Compute.yaml
View File

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

1
roles/ComputeAlt.yaml
View File

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

1
roles/ComputeHCI.yaml
View File

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

1
roles/ComputeInstanceHA.yaml
View File

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

1
roles/ComputeOvsDpdk.yaml
View File

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

1
roles/ComputeOvsDpdkRT.yaml
View File

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

1
roles/ComputeRealTime.yaml
View File

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

1
roles/ComputeSriov.yaml
View File

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

1
roles/ComputeSriovRT.yaml
View File

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

1
roles/HciCephAll.yaml
View File

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

1
roles/HciCephFile.yaml
View File

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

1
roles/HciCephMon.yaml
View File

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

1
roles/HciCephObject.yaml
View File

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

1
roles/ObjectStorage.yaml
View File

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

4
roles/README.rst
View File

@ -47,10 +47,6 @@ Role Options
* disable_constraints: (boolean) optional, whether to disable Nova and Glance
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
specified by services to run in batches vs all nodes at once.
This defaults to 1, but larger batches may be specified here.

2
roles_data.yaml
View File

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