summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-17 16:03:36 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-17 16:03:36 (GMT)
commiteca4102de2c146fade89968ba7a68d03b69fc459 (patch)
tree73fdb280280d7e89a771c5dff4ef97d80c461ea0
parent562a7fa353747a62cede095ae7790ab4854ec922 (diff)
parentd980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d (diff)
downloaddefinitions-eca4102de2c146fade89968ba7a68d03b69fc459.tar.gz
Merge branch 'baserock/pedroalvarez/optional-upstream-trove'
Reviewed-by: Sam Thursfield Reviewed-by: Lars Wirzenius
-rw-r--r--strata/trove.morph2
-rwxr-xr-xtrove.configure8
-rw-r--r--trove.configure.help4
3 files changed, 4 insertions, 10 deletions
diff --git a/strata/trove.morph b/strata/trove.morph
index 1488835..6db0be5 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -198,7 +198,7 @@ chunks:
- name: trove-setup
morph: strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
- ref: b2260b5fb45f4519bf7ea31ac278ffac7cddfbb7
+ ref: e594df7ed432d74cc56eaa5e29a1bfed7b22aae5
unpetrify-ref: master
build-depends: []
- name: lorry-controller
diff --git a/trove.configure b/trove.configure
index 4cc9720..f823762 100755
--- a/trove.configure
+++ b/trove.configure
@@ -64,11 +64,6 @@ if test "x$TROVE_COMPANY" = "x"; then
error_vars=true
fi
-if test "x$UPSTREAM_TROVE" = "x"; then
- echo "ERROR: UPSTREAM_TROVE needs to be defined."
- error_vars=true
-fi
-
if test "x$TROVE_ADMIN_USER" = "x"; then
echo "ERROR: TROVE_ADMIN_USER needs to be defined."
error_vars=true
@@ -124,7 +119,6 @@ import os, sys, yaml
trove_configuration={
'TROVE_ID': os.environ['TROVE_ID'],
'TROVE_COMPANY': os.environ['TROVE_COMPANY'],
- 'UPSTREAM_TROVE': os.environ['UPSTREAM_TROVE'],
'TROVE_ADMIN_USER': os.environ['TROVE_ADMIN_USER'],
'TROVE_ADMIN_EMAIL': os.environ['TROVE_ADMIN_EMAIL'],
'TROVE_ADMIN_NAME': os.environ['TROVE_ADMIN_NAME'],
@@ -138,7 +132,7 @@ trove_configuration={
optional_keys = ('MASON_ID', 'HOSTNAME', 'TROVE_HOSTNAME',
'LORRY_CONTROLLER_MINIONS', 'TROVE_BACKUP_KEYS',
- 'UPSTREAM_TROVE_PROTOCOL')
+ 'UPSTREAM_TROVE', 'UPSTREAM_TROVE_PROTOCOL')
for key in optional_keys:
if key in os.environ:
diff --git a/trove.configure.help b/trove.configure.help
index b8056e3..c96bdf7 100644
--- a/trove.configure.help
+++ b/trove.configure.help
@@ -82,8 +82,8 @@ help: |
access it. This configuration does not do that automatically.
* `UPSTREAM_TROVE` -- public name of the upstream Trove (domain
- name or IP address). The new Trove will be configured to mirror
- that Trove.
+ name or IP address). This is an optional setting. If it's set,
+ the new Trove will be configured to mirror that Trove.
* `TROVE_ADMIN_USER`, `TROVE_ADMIN_EMAIL`, `TROVE_ADMIN_NAME`,
`TROVE_ADMIN_SSH_PUBKEY` -- details of the Trove's (initial)