From 81635a254987bba385ce1c1c6b1f5c8b8a2e45eb Mon Sep 17 00:00:00 2001 From: Joe Beda Date: Wed, 15 Oct 2014 10:21:22 -0700 Subject: [PATCH] Remove duplicate code for GCE cluster start --- cluster/gce/templates/salt-master.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cluster/gce/templates/salt-master.sh b/cluster/gce/templates/salt-master.sh index 132497774da..b3a38d72e44 100755 --- a/cluster/gce/templates/salt-master.sh +++ b/cluster/gce/templates/salt-master.sh @@ -28,10 +28,6 @@ grains: cloud: gce EOF -cat </srv/pillar/cluster-params.sls -node_instance_prefix: $NODE_INSTANCE_PREFIX -EOF - # Auto accept all keys from minions that try to join mkdir -p /etc/salt/master.d cat </etc/salt/master.d/auto-accept.conf @@ -45,9 +41,6 @@ reactor: - /srv/reactor/start.sls EOF -mkdir -p /srv/salt/nginx -echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd - # Install Salt # # We specify -X to avoid a race condition that can cause minion failure to @@ -57,5 +50,3 @@ echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd set +x curl -L --connect-timeout 20 --retry 6 --retry-delay 10 http://bootstrap.saltstack.com | sh -s -- -M -X set -x - -echo $MASTER_HTPASSWD > /srv/salt/nginx/htpasswd