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.

Related-Bug: #1611800
Closes-Bug: #1674858
Change-Id: Iff7d715f6730c5633f1146008504b4309ef3133d
This commit is contained in:
Steven Hardy 2017-03-22 09:18:29 +00:00
parent b758dff575
commit 947a7148e8
7 changed files with 13 additions and 9 deletions

View File

@ -4,6 +4,7 @@ resource_registry:
# enough (as we want to share the ansible tasks steps etc) # enough (as we want to share the ansible tasks steps etc)
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
parameter_defaults: parameter_defaults:
EnableConfigPurge: false
UpgradeLevelNovaCompute: auto UpgradeLevelNovaCompute: auto
UpgradeInitCommonCommand: | UpgradeInitCommonCommand: |
#!/bin/bash #!/bin/bash

View File

@ -1,6 +1,7 @@
resource_registry: resource_registry:
OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml OS::TripleO::PostDeploySteps: ../puppet/major_upgrade_steps.yaml
parameter_defaults: parameter_defaults:
EnableConfigPurge: true
UpgradeLevelNovaCompute: auto UpgradeLevelNovaCompute: auto
UpgradeInitCommonCommand: | UpgradeInitCommonCommand: |
#!/bin/bash #!/bin/bash

View File

@ -3,5 +3,6 @@
resource_registry: resource_registry:
OS::TripleO::PostDeploySteps: ../docker/post.yaml OS::TripleO::PostDeploySteps: ../docker/post.yaml
parameter_defaults: parameter_defaults:
EnableConfigPurge: false
UpgradeLevelNovaCompute: '' UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: '' UpgradeInitCommonCommand: ''

View File

@ -3,5 +3,6 @@
resource_registry: resource_registry:
OS::TripleO::PostDeploySteps: ../puppet/post.yaml OS::TripleO::PostDeploySteps: ../puppet/post.yaml
parameter_defaults: parameter_defaults:
EnableConfigPurge: false
UpgradeLevelNovaCompute: '' UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: '' UpgradeInitCommonCommand: ''

View File

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

View File

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

View File

@ -24,10 +24,10 @@ parameters:
description: Set to True to enable debugging on all services. description: Set to True to enable debugging on all services.
EnableConfigPurge: EnableConfigPurge:
type: boolean type: boolean
default: true default: false
description: > description: >
Remove configuration that is not generated by TripleO. Setting Remove configuration that is not generated by TripleO. Used to avoid
to false may result in configuration remnants after updates/upgrades. configuration remnants after upgrades.
RabbitPassword: RabbitPassword:
description: The password for RabbitMQ description: The password for RabbitMQ
type: string type: string