Giuseppe Lavagetto has submitted this change and it was merged. Change subject: wmf-reimage: perform the first puppet run ......................................................................
wmf-reimage: perform the first puppet run Change-Id: I47940910e0bf7028c654dc8e849023978bc8218c Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M modules/puppetmaster/files/wmf-reimage 1 file changed, 9 insertions(+), 3 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/puppetmaster/files/wmf-reimage b/modules/puppetmaster/files/wmf-reimage index e45c982..41747e2 100755 --- a/modules/puppetmaster/files/wmf-reimage +++ b/modules/puppetmaster/files/wmf-reimage @@ -8,7 +8,7 @@ FORCE=0 NOCLEAN=0 NOREBOOT=0 - +RUNPUPPET=1 function log { echo "$@" } @@ -128,12 +128,12 @@ function usage { - echo "Usage: $0 [-y][-r][-n][-s SECONDS] <nodename> <mgmtname>"; exit 1; + echo "Usage: $0 [-y][-r][-n][-p][-s SECONDS] <nodename> <mgmtname>"; exit 1; } ## Main script -while getopts "yrns:" option; do +while getopts "yrnps:" option; do case $option in y) FORCE=1 @@ -146,6 +146,9 @@ ;; s) SLEEPTIME=${OPTARG} + ;; + p) + RUNPUPPET=0 ;; *) usage @@ -165,6 +168,9 @@ fi; test $NOREBOOT -eq 0 && set_pxe_and_reboot $mgmtname sign_puppet $nodename $FORCE +if [ $RUNPUPPET -eq 1 ]; then + enable_and_run_puppet $nodename +fi; sign_salt $nodename $FORCE log "Node ${nodename} is now signed and both puppet and salt should work." -- To view, visit https://gerrit.wikimedia.org/r/192793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47940910e0bf7028c654dc8e849023978bc8218c Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
