Filippo Giunchedi has submitted this change and it was merged.
Change subject: "make deploy" safer by default, require DESTHOST
......................................................................
"make deploy" safer by default, require DESTHOST
this should avoid accidentally typing "make deploy" and triggering a deploy,
require DESTHOST instead and update README
Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
---
M Makefile
M README.md
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/Makefile b/Makefile
index c819363..d238ce8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTHOST=palladium.eqiad.wmnet
+DESTHOST=
TARGETS=eqiad-prod esams-prod codfw-prod
BUILDER_FILES=$(foreach dir,$(TARGETS),$(wildcard $(dir)/*.builder))
@@ -17,6 +17,7 @@
# TODO(fgiunchedi): rsync HEAD, not the working tree
deploy:
+ [ -n "$(DESTHOST)" ] || { echo 'set DESTHOST to deploy'; exit 1; }
rsync --progress --verbose --archive --compress --relative \
$(RING_FILES) $(BUILDER_FILES) $(DESTHOST):swift-ring
ssh $(DESTHOST) "sudo rsync --verbose --backup --recursive \
diff --git a/README.md b/README.md
index fac67d8..29e2e7f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
review
* Once merged, deploy the rings to the puppet master:
- make deploy
+ make deploy DESTHOST=puppet.eqiad.wmnet
Testing
--
To view, visit https://gerrit.wikimedia.org/r/176233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-ring
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
