From 443bdc0ab26ce003a175134a5f25189d26e5e6b0 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 22 Mar 2017 09:18:29 +0000 Subject: [PATCH] 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 947a7148e807e74daf9e30e4e8c891d5bdacc69f) (cherry picked from commit c71229f0924f3c60a3172261734cbbdd731e5e5d) --- environments/major-upgrade-pacemaker-converge.yaml | 1 + environments/major-upgrade-pacemaker-init.yaml | 1 + puppet/services/neutron-base.yaml | 6 +++--- puppet/services/nova-base.yaml | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/environments/major-upgrade-pacemaker-converge.yaml b/environments/major-upgrade-pacemaker-converge.yaml index e9a5f9beff..a277d8a138 100644 --- a/environments/major-upgrade-pacemaker-converge.yaml +++ b/environments/major-upgrade-pacemaker-converge.yaml @@ -1,5 +1,6 @@ parameter_defaults: UpgradeLevelNovaCompute: '' + EnableConfigPurge: false resource_registry: OS::TripleO::Services::SaharaApi: ../puppet/services/sahara-api.yaml diff --git a/environments/major-upgrade-pacemaker-init.yaml b/environments/major-upgrade-pacemaker-init.yaml index f4f361df67..30cc1ae674 100644 --- a/environments/major-upgrade-pacemaker-init.yaml +++ b/environments/major-upgrade-pacemaker-init.yaml @@ -1,5 +1,6 @@ parameter_defaults: UpgradeLevelNovaCompute: mitaka + EnableConfigPurge: true resource_registry: OS::TripleO::Tasks::UpdateWorkflow: ../extraconfig/tasks/major_upgrade_pacemaker_init.yaml diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 6bb4ba081f..628b283f57 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -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 diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 9f11f5a76f..a9736c8bb9 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -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