Skip to content

Commit abb1982

Browse files
authored
Merge pull request #191 from puppetlabs/cleaner-output
Add --color=false to other puppet commands
2 parents 63c3546 + 2139471 commit abb1982

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

tasks/enable_replica.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env PATH="/opt/puppetlabs/bin:${PATH}" \
1515
USER="$USER" \
1616
HOME="$HOME" \
1717
puppet infrastructure enable replica "$PT_replica" \
18+
--color false \
1819
--skip-agent-config \
1920
--topology mono-with-compile \
2021
--yes --token-file "$TOKEN_FILE"

tasks/provision_replica.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ set -e
1515

1616
if [ "$PT_legacy" = "false" ]; then
1717
puppet infrastructure provision replica "$PT_replica" \
18+
--color false \
1819
--yes --token-file "$TOKEN_FILE" \
1920
--skip-agent-config \
2021
--topology mono-with-compile \
2122
--enable
2223

2324
elif [ "$PT_legacy" = "true" ]; then
2425
puppet infrastructure provision replica "$PT_replica" \
26+
--color false \
2527
--token-file "$TOKEN_FILE"
2628

2729
puppet infrastructure enable replica "$PT_replica" \
30+
--color false \
2831
--yes --token-file "$TOKEN_FILE" \
2932
--skip-agent-config \
3033
--topology mono-with-compile

tasks/puppet_infra_upgrade.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def execute!
2121
exit 0 if @targets.empty?
2222
token_file = @token_file || File.join(Etc.getpwuid.dir, '.puppetlabs', 'token')
2323

24-
cmd = ['/opt/puppetlabs/bin/puppet-infrastructure', '--render-as', 'json', 'upgrade']
24+
cmd = ['/opt/puppetlabs/bin/puppet-infrastructure', '--color', 'false', '--render-as', 'json', 'upgrade']
2525
cmd << '--token-file' << token_file unless @token_file.nil?
2626
cmd << @type << @targets.join(',')
2727

0 commit comments

Comments
 (0)