diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-29 04:12:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-29 04:12:11 +0000 |
| commit | e2f1a56e80c43d69b6e725e5620864229ecdba7f (patch) | |
| tree | 05b7d07bb188da08251ee3d5edc939f79b05b1b7 /puppet/services | |
| parent | df26adff6a3120d12829925fabafb404c41b8d9e (diff) | |
| parent | c71229f0924f3c60a3172261734cbbdd731e5e5d (diff) | |
Merge "Only set EnableConfigPurge on major upgrades" into stable/ocata
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/neutron-base.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/nova-base.yaml | 6 | ||||
| -rw-r--r-- | puppet/services/octavia-base.yaml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 43657bd9..d0176781 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: 1500 diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index ceacb0b2..8100c9b1 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -58,10 +58,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 diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml index b537a2bc..f3aa1d64 100644 --- a/puppet/services/octavia-base.yaml +++ b/puppet/services/octavia-base.yaml @@ -24,10 +24,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. RabbitPassword: description: The password for RabbitMQ type: string |