summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-05-10 14:30:07 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-05-10 14:30:07 +0000
commitdead8f95777a6163aa2e5a5455a21d028885f06f (patch)
treeedec8e2bb4d869dc3de374044da6dbc07f4eea2a
parentb38661d6be2eafd42c43598505f8d3661a9e73fb (diff)
downloadtrove-setup-dead8f95777a6163aa2e5a5455a21d028885f06f.tar.gz
Use default hosts.json.txt from /var/lib/trove-setup
This is created either by the user of the trove configuration extension, or the configuration extension itself if one wasn't provided.
-rwxr-xr-xbins/trove-early-setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/bins/trove-early-setup b/bins/trove-early-setup
index 82aec11..3ade647 100755
--- a/bins/trove-early-setup
+++ b/bins/trove-early-setup
@@ -97,7 +97,7 @@ cache-configured: /home/cache/.cache-setup
su -c "ssh localhost create $${PREFIX}/local-config/mason" - git; \
su -c "git clone ssh://localhost/$${PREFIX}/local-config/mason.git /tmp/mason-config" - git
su -c "cd /tmp/mason-config; mkdir ci1; (echo '[';echo ']') > ci1/systems.json.txt" - git
- su -c "cd /tmp/mason-config; (echo '['; echo ']') > ci1/hosts.json.txt" - git
+ su -c "cp /var/lib/trove-setup/hosts.json.txt /tmp/mason-config/ci1" - git
su -c "cd /tmp/mason-config; git add ci1; git commit -m 'Set initial Mason config'; git push origin master" - git
su -c "rm -fr /tmp/mason-config" - git
su -c 'mkdir /home/mason/jobs' - mason