Merge pull request #5561 from tOnI0/master

simplify fleet invocation
This commit is contained in:
CJ Cullen 2015-03-18 11:21:52 -07:00
commit 4586f8ce29

View File

@ -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",