openstack/tripleo-heat-templates
Code Issues Proposed changes

Drop step_config as top level docker requirement

Browse Source 
Step config is only required within the puppet_configs section
of docker/services/*. This patch drops the top level 'step_config'
and updates the unit tests accordingly.

Change-Id: I7dc7cfae3ef1965ec95b1d9ef23e7f162418c034
This commit is contained in:
Dan Prince
2017-11-13 14:51:37 -05:00
parent 052ad2607f
commit a307fe7ffc
103 changed files with 323 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docker/services/gnocchi-metricd.yaml
View File

@@ -63,17 +63,16 @@ outputs:
config_settings: {get_attr: [GnocchiMetricdBase, role_data, config_settings]}
logging_source: {get_attr: [GnocchiMetricdBase, role_data, logging_source]}
logging_groups: {get_attr: [GnocchiMetricdBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
- - {get_attr: [GnocchiMetricdBase, role_data, step_config]}
- {get_attr: [MySQLClient, role_data, step_config]}
service_config_settings: {get_attr: [GnocchiMetricdBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: gnocchi
puppet_tags: gnocchi_config
step_config: *step_config
step_config:
list_join:
- "\n"
- - {get_attr: [GnocchiMetricdBase, role_data, step_config]}
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerGnocchiConfigImage}
kolla_config:
/var/lib/kolla/config_files/gnocchi_metricd.json: