diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-10 18:19:10 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-10 18:19:10 +0000 |
commit | 2bf778ffdadbdad8f0afdbc213b2d0899dc9702d (patch) | |
tree | 7f070e6f39eae6273d80c2f0a08de6851852f642 | |
parent | 28b9acf5b5ff39b132feb4e04dff0aaf77dfef9a (diff) | |
parent | 34e1a03fa6da7d1887bde1085f194b3f9d157bdf (diff) | |
download | definitions-2bf778ffdadbdad8f0afdbc213b2d0899dc9702d.tar.gz |
Merge branch 'sam/remove-old-mason-config'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
-rw-r--r-- | clusters/trove-example.morph | 2 | ||||
-rw-r--r-- | strata/trove.morph | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph index 25ee579d..1b1e9777 100644 --- a/clusters/trove-example.morph +++ b/clusters/trove-example.morph @@ -8,7 +8,6 @@ description: | mkdir ssh_keys ssh-keygen -N '' -f ssh_keys/lorry.key - ssh-keygen -N '' -f ssh_keys/mason.key ssh-keygen -N '' -f ssh_keys/worker.key ssh-keygen -N '' -f ssh_keys/trove-admin.key @@ -40,7 +39,6 @@ systems: RAM_SIZE: 2G DISK_SIZE: 8G LORRY_SSH_KEY: ssh_keys/lorry.key - MASON_SSH_PUBKEY: ssh_keys/mason.key.pub WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub TROVE_ADMIN_EMAIL: adminuser@example.com TROVE_ADMIN_NAME: Nobody diff --git a/strata/trove.morph b/strata/trove.morph index 3b5ca528..b3d95533 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -72,7 +72,7 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 98cf2ab9c80c8efd0df9086353972e7dc73f40b8 + ref: 7134fb36f7a1c62111d2eaea5c5b32cf2169cec6 unpetrify-ref: master build-depends: [] - name: lorry-controller |