openstack
/
heat-agents
Code Issues Proposed changes

Remove color from puppet output 

This passes --color false to the puppet apply call, removing color from
puppet output. As it's meant to be passed to software deployment, it
will make it more readable.

Change-Id: I12074f06f6bdbddc8706426b1515b3db4affb2f7
This commit is contained in:
Thomas Herve 2017-05-17 09:46:06 +02:00
parent 3a86f8789c
commit ffe8ea7d9a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat-config-puppet/install.d/hook-puppet.py
View File

@ -108,7 +108,7 @@ def main(argv=sys.argv):
'w') as f:
f.write(c.get('config', '').encode('utf-8'))
cmd = [PUPPET_CMD, 'apply', '--detailed-exitcodes', fn]
cmd = [PUPPET_CMD, 'apply', '--color', 'false', '--detailed-exitcodes', fn]
# This is the default log destination to print out to the console and
# captured by heat via the subprocess method below.
cmd.insert(-1, '--logdest')

10
tests/test_hook_puppet.py
View File

@ -101,6 +101,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -138,6 +140,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -166,6 +170,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -202,6 +208,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',
@ -258,6 +266,8 @@ class HookPuppetTest(common.RunScriptTest):
[
self.fake_tool_path,
'apply',
'--color',
'false',
'--detailed-exitcodes',
'--logdest',
'console',