From df9a1a2252760ff98a8b6fd2665739636d92b50f Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 30 Jan 2015 15:15:33 +0000 Subject: Update trove-setup for branch sam/remove-mason-hook --- strata/trove.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1 From 34e1a03fa6da7d1887bde1085f194b3f9d157bdf Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 30 Jan 2015 15:28:42 +0000 Subject: Remove Mason configuration from example Trove cluster This is for an old implemenation of Mason. The more recent implementations don't need special configuration to be done on the Trove. --- clusters/trove-example.morph | 2 -- 1 file changed, 2 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 -- cgit v1.2.1