Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add new environment for debug"
[apex-tripleo-heat-templates.git]
/
puppet
/
blockstorage-role.yaml
diff --git
a/puppet/blockstorage-role.yaml
b/puppet/blockstorage-role.yaml
index
2b197a2
..
8b695ff
100644
(file)
--- a/
puppet/blockstorage-role.yaml
+++ b/
puppet/blockstorage-role.yaml
@@
-96,12
+96,6
@@
parameters:
type: string
description: Command which will be run whenever configuration data changes
default: os-refresh-config --timeout 14400
type: string
description: Command which will be run whenever configuration data changes
default: os-refresh-config --timeout 14400
- LoggingSources:
- type: json
- default: []
- LoggingGroups:
- type: comma_delimited_list
- default: []
resources:
BlockStorage:
resources:
BlockStorage:
@@
-277,8
+271,6
@@
resources:
volume:
mapped_data:
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
volume:
mapped_data:
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
- tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
- tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
# Resource for site-specific injection of root certificate
NodeTLSCAData:
# Resource for site-specific injection of root certificate
NodeTLSCAData: