Ryan Lane has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67362
Change subject: Suppress salt logging in cli operations
......................................................................
Suppress salt logging in cli operations
Change-Id: I2475194a2f27d2a3e8897863a894cb6b49809562
---
M modules/deployment/files/git-deploy/hooks/deploylib.py
M modules/deployment/files/git-deploy/utils/deploy-info
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/67362/1
diff --git a/modules/deployment/files/git-deploy/hooks/deploylib.py
b/modules/deployment/files/git-deploy/hooks/deploylib.py
index 1ddc633..8a86392 100755
--- a/modules/deployment/files/git-deploy/hooks/deploylib.py
+++ b/modules/deployment/files/git-deploy/hooks/deploylib.py
@@ -6,8 +6,8 @@
def update_repos(prefix, tag):
- print "Running: sudo salt-call --out json pillar.data"
- p = subprocess.Popen("sudo salt-call --out json pillar.data",
shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ print "Running: sudo salt-call -l quiet --out json pillar.data"
+ p = subprocess.Popen("sudo salt-call -l quiet --out json pillar.data",
shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out = p.communicate()[0]
try:
pillar = json.loads(out)
@@ -53,14 +53,14 @@
def fetch(prefix):
- print "Running: sudo salt-call publish.runner deploy.fetch '%s'" %
(prefix)
- p = subprocess.Popen("sudo salt-call publish.runner deploy.fetch '%s'"
% (prefix), shell=True, stdout=subprocess.PIPE)
+ print "Running: sudo salt-call -l quiet publish.runner deploy.fetch
'%s'" % (prefix)
+ p = subprocess.Popen("sudo salt-call -l quiet publish.runner
deploy.fetch '%s'" % (prefix), shell=True, stdout=subprocess.PIPE)
out = p.communicate()[0]
def checkout(prefix, force):
- print "Running: sudo salt-call publish.runner deploy.checkout '%s,%s'"
% (prefix,force)
- p = subprocess.Popen("sudo salt-call publish.runner deploy.checkout
'%s,%s'" % (prefix,force), shell=True, stdout=subprocess.PIPE)
+ print "Running: sudo salt-call -l quiet publish.runner deploy.checkout
'%s,%s'" % (prefix,force)
+ p = subprocess.Popen("sudo salt-call -l quiet publish.runner
deploy.checkout '%s,%s'" % (prefix,force), shell=True, stdout=subprocess.PIPE)
out = p.communicate()[0]
diff --git a/modules/deployment/files/git-deploy/utils/deploy-info
b/modules/deployment/files/git-deploy/utils/deploy-info
index 5aa3293..a858ebf 100644
--- a/modules/deployment/files/git-deploy/utils/deploy-info
+++ b/modules/deployment/files/git-deploy/utils/deploy-info
@@ -20,7 +20,7 @@
parser.add_option("--full-report", action="store_true", dest="fullreport",
default=False, help="Show a full report of the state of the requested repo, or
all repos")
(options, args) = parser.parse_args()
serv = redis.Redis(host='localhost', port=6379, db=0)
- p = subprocess.Popen("sudo salt-call --out json pillar.data", shell=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen("sudo salt-call -l quiet --out json pillar.data",
shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out = p.communicate()[0]
try:
pillar = json.loads(out)
--
To view, visit https://gerrit.wikimedia.org/r/67362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2475194a2f27d2a3e8897863a894cb6b49809562
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ryan Lane <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
