summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorBrent Eagles <beagles@redhat.com>2016-08-10 12:13:51 -0230
committerBrent Eagles <beagles@redhat.com>2016-08-10 12:13:51 -0230
commitf7f514cf67274b40f0f079d5349d7e9fda9d1790 (patch)
tree3fbd3ed938f694f73e1734b6b519d1979b30e102 /puppet/services
parentdae7f72898dec10a53d724d989dd7083b60c40b5 (diff)
Add parameter for enabling purging configuration files
This patch adds a parameter, EnableConfigPurge, to the base nova and neutron service files. The value is passed to their respective puppet modules to control whether resources not managed by puppet are purged from the config files. The default value is set to true. Change-Id: I32732dc2ed7a7b3187e8727592cb4add0c6b9cf6 Closes-Bug: #1611800
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/neutron-base.yaml7
-rw-r--r--puppet/services/nova-base.yaml7
2 files changed, 14 insertions, 0 deletions
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index f6339c83..bc8dd8d1 100644
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -42,6 +42,12 @@ parameters:
type: string
default: ''
description: Set to True to enable debugging on all services.
+ EnableConfigPurge:
+ type: boolean
+ default: true
+ description: >
+ Remove configuration that is not generated by TripleO. Setting
+ to false may result in configuration remnants after updates/upgrades.
outputs:
role_data:
@@ -61,6 +67,7 @@ outputs:
params:
PLUGINS: {get_param: NeutronServicePlugins}
neutron::debug: {get_param: Debug}
+ neutron::purge_config: {get_param: EnableConfigPurge}
neutron::allow_overlapping_ips: true
neutron::rabbit_heartbeat_timeout_threshold: 60
neutron::host: '"%{::fqdn}"' #NOTE: extra quoting is needed
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 5bc94b2b..90788144 100644
--- a/puppet/services/nova-base.yaml
+++ b/puppet/services/nova-base.yaml
@@ -39,6 +39,12 @@ parameters:
type: string
default: ''
description: Set to True to enable debugging on all services.
+ EnableConfigPurge:
+ type: boolean
+ default: true
+ description: >
+ Remove configuration that is not generated by TripleO. Setting
+ to false may result in configuration remnants after updates/upgrades.
outputs:
role_data:
@@ -83,6 +89,7 @@ outputs:
- '%'
- "%{hiera('mysql_bind_host')}"
nova::debug: {get_param: Debug}
+ nova::purge_config: {get_param: EnableConfigPurge}
nova::network::neutron::neutron_project_name: 'service'
nova::network::neutron::neutron_username: 'neutron'
nova::network::neutron::dhcp_domain: ''