From a4e29053f74d9e290da6b6f04118b6002c39a387 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Tue, 17 Mar 2015 20:01:01 +0100 Subject: [PATCH] simplify fleet invocation see commit b5a50ca --- .../aws/cloudformation-template.json | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/docs/getting-started-guides/aws/cloudformation-template.json b/docs/getting-started-guides/aws/cloudformation-template.json index b789afacd9f..e2682f8e077 100644 --- a/docs/getting-started-guides/aws/cloudformation-template.json +++ b/docs/getting-started-guides/aws/cloudformation-template.json @@ -141,6 +141,9 @@ " #! /usr/bin/bash\n", " until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done\n", "coreos:\n", + " fleet:\n", + " etcd-servers: http://localhost:4001\n", + " metadata: \"role=master\"\n", " units:\n", " - name: setup-network-environment.service\n", " command: start\n", @@ -179,26 +182,8 @@ " --snapshot true\n", " Restart=always\n", " RestartSec=10s\n", - " - name: fleet.socket\n", - " command: start\n", - " content: |\n", - " [Socket]\n", - " ListenStream=/var/run/fleet.sock\n", " - name: fleet.service\n", " command: start\n", - " content: |\n", - " [Unit]\n", - " Description=fleet daemon\n", - " Wants=etcd.service\n", - " After=etcd.service\n", - " Wants=fleet.socket\n", - " After=fleet.socket\n\n", - " [Service]\n", - " Environment=\"FLEET_ETCD_SERVERS=http://127.0.0.1:4001\"\n", - " Environment=\"FLEET_METADATA=role=master\"\n", - " ExecStart=/usr/bin/fleetd\n", - " Restart=always\n", - " RestartSec=10s\n", " - name: etcd-waiter.service\n", " command: start\n", " content: |\n",