jenkins-bot has submitted this change and it was merged.
Change subject: Fix broken 'unless' condition for Exec['set mysql password']
......................................................................
Fix broken 'unless' condition for Exec['set mysql password']
mysqladmin's "ping" subcommand returns 0 for both success and failure, so it is
unsuitable as a predicate. "status" had the right behavior.
Change-Id: I0f69e59b92f86dd3579b603a550aa4f91e5643fd
---
M puppet/modules/mysql/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mysql/manifests/init.pp
b/puppet/modules/mysql/manifests/init.pp
index 8199163..75263d1 100644
--- a/puppet/modules/mysql/manifests/init.pp
+++ b/puppet/modules/mysql/manifests/init.pp
@@ -36,7 +36,7 @@
exec { 'set mysql password':
command => "mysqladmin -u root password \"${root_password}\"",
- unless => "mysqladmin -u root -p\"${root_password}\" ping",
+ unless => "mysqladmin -u root -p\"${root_password}\" status",
require => Service['mysql'],
}
--
To view, visit https://gerrit.wikimedia.org/r/77259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f69e59b92f86dd3579b603a550aa4f91e5643fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
