Only set EnableConfigPurge on major upgrades

Bug #1611800 fixed an upgrade issue by enabling purging configs for
some services, but this causes issues such as longer updates and
restarting services in the minor update case, so only do this for
major upgrades, and default to false.

 Conflicts: (don't exist on this branch or are renamed)
	environments/major-upgrade-composable-steps-docker.yaml
	environments/major-upgrade-converge-docker.yaml
	environments/major-upgrade-composable-steps.yaml
	environments/major-upgrade-converge.yaml
	puppet/services/octavia-base.yaml

Related-Bug: #1611800
Closes-Bug: #1674858
Change-Id: Iff7d715f6730c5633f1146008504b4309ef3133d
(cherry picked from commit 947a7148e8)
(cherry picked from commit c71229f092)
This commit is contained in:
Steven Hardy 2017-03-22 09:18:29 +00:00
parent 7ec34ab6b9
commit 443bdc0ab2
4 changed files with 8 additions and 6 deletions

View File

@ -1,5 +1,6 @@
parameter_defaults:
UpgradeLevelNovaCompute: ''
EnableConfigPurge: false
resource_registry:
OS::TripleO::Services::SaharaApi: ../puppet/services/sahara-api.yaml

View File

@ -1,5 +1,6 @@
parameter_defaults:
UpgradeLevelNovaCompute: mitaka
EnableConfigPurge: true
resource_registry:
OS::TripleO::Tasks::UpdateWorkflow: ../extraconfig/tasks/major_upgrade_pacemaker_init.yaml

View File

@ -44,10 +44,10 @@ parameters:
description: Set to True to enable debugging on all services.
EnableConfigPurge:
type: boolean
default: true
default: false
description: >
Remove configuration that is not generated by TripleO. Setting
to false may result in configuration remnants after updates/upgrades.
Remove configuration that is not generated by TripleO. Used to avoid
configuration remnants after upgrades.
NeutronGlobalPhysnetMtu:
type: number
default: 1496

View File

@ -54,10 +54,10 @@ parameters:
description: Set to True to enable debugging on all services.
EnableConfigPurge:
type: boolean
default: true
default: false
description: >
Remove configuration that is not generated by TripleO. Setting
to false may result in configuration remnants after updates/upgrades.
Remove configuration that is not generated by TripleO. Used to avoid
configuration remnants after upgrades.
NovaIPv6:
default: false
description: Enable IPv6 features in Nova