openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Correct indentation of docker_puppet_apply.sh run 

The backport of Icf4a64ed76635e39bbb34c3a088c55e1f14fddca had an
indentation error which caused the command to be
['/docker_puppet_apply.sh'] instead of '/docker_puppet_apply.sh'

This caused an error when paunch logged the command it would run.

Making the paunch logging more robust would have made this easier to
debug, as would capturing /var/log/tripleo-config in our CI jobs.

Change-Id: I80734ccc842d5be01555ee5a863d0de9a8101d33
Closes-Bug: #1743754
This commit is contained in:
Steve Baker 2018-01-23 08:58:40 +13:00
parent 44fc7e2667
commit ebf01289ce
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/services/haproxy.yaml
View File

@ -162,14 +162,14 @@ outputs:
privileged: true privileged: true
command: # '/docker_puppet_apply.sh "STEP" "TAGS" "CONFIG" "DEBUG"' command: # '/docker_puppet_apply.sh "STEP" "TAGS" "CONFIG" "DEBUG"'
list_concat: list_concat:
- - - '/docker_puppet_apply.sh' - - '/docker_puppet_apply.sh'
- '1' - '1'
- 'tripleo::firewall::rule' - 'tripleo::firewall::rule'
- {get_attr: [HAProxyBase, role_data, step_config]} - {get_attr: [HAProxyBase, role_data, step_config]}
- if: - if:
- puppet_debug_enabled - puppet_debug_enabled
- - '--debug --verbose' - - '--debug --verbose'
- - '' - - ''
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, docker_puppet_apply_volumes]} - {get_attr: [ContainersCommon, docker_puppet_apply_volumes]}