From b5a50ca9da4b904be47d34554b45761faff78c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Meireles?= Date: Thu, 12 Mar 2015 12:16:18 +0000 Subject: [PATCH] simplify fleet invocation across CoreOS cloud-configs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: António Meireles --- .../aws/cloud-configs/master.yaml | 24 +++---------------- .../aws/cloud-configs/node.yaml | 15 +++--------- .../coreos/cloud-configs/master.yaml | 24 ++++--------------- .../coreos/cloud-configs/node.yaml | 15 +++--------- 4 files changed, 13 insertions(+), 65 deletions(-) diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml index cd5d0ce35b54d..e96234f39343c 100644 --- a/docs/getting-started-guides/aws/cloud-configs/master.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/master.yaml @@ -8,6 +8,9 @@ write_files: #! /usr/bin/bash until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done coreos: + fleet: + etcd-servers: http://localhost:4001 + metadata: "role=master" units: - name: setup-network-environment.service command: start @@ -48,27 +51,6 @@ coreos: --snapshot true Restart=always RestartSec=10s - - name: fleet.socket - command: start - content: | - [Socket] - ListenStream=/var/run/fleet.sock - - name: fleet.service - command: start - content: | - [Unit] - Description=fleet daemon - Wants=etcd.service - After=etcd.service - Wants=fleet.socket - After=fleet.socket - - [Service] - Environment="FLEET_ETCD_SERVERS=http://127.0.0.1:4001" - Environment="FLEET_METADATA=role=master" - ExecStart=/usr/bin/fleetd - Restart=always - RestartSec=10s - name: etcd-waiter.service command: start content: | diff --git a/docs/getting-started-guides/aws/cloud-configs/node.yaml b/docs/getting-started-guides/aws/cloud-configs/node.yaml index de0b0d4e65b53..098a642bdd886 100644 --- a/docs/getting-started-guides/aws/cloud-configs/node.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/node.yaml @@ -1,23 +1,14 @@ #cloud-config coreos: + fleet: + etcd-servers: http://:4001 + metadata: "role=node" units: - name: etcd.service mask: true - name: fleet.service command: start - content: | - [Unit] - Description=fleet daemon - Wants=fleet.socket - After=fleet.socket - - [Service] - Environment="FLEET_ETCD_SERVERS=http://:4001" - Environment="FLEET_METADATA=role=node" - ExecStart=/usr/bin/fleetd - Restart=always - RestartSec=10s - name: flannel.service command: start content: | diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml index 1f57d74c328b3..5f8c71376a9b8 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/master.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/master.yaml @@ -8,6 +8,9 @@ write_files: #! /usr/bin/bash until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done coreos: + fleet: + etcd-servers: http://localhost:4001 + metadata: "role=master" units: - name: setup-network-environment.service command: start @@ -48,27 +51,8 @@ coreos: --snapshot true Restart=always RestartSec=10s - - name: fleet.socket - command: start - content: | - [Socket] - ListenStream=/var/run/fleet.sock - name: fleet.service command: start - content: | - [Unit] - Description=fleet daemon - Wants=etcd.service - After=etcd.service - Wants=fleet.socket - After=fleet.socket - - [Service] - Environment="FLEET_ETCD_SERVERS=http://127.0.0.1:4001" - Environment="FLEET_METADATA=role=master" - ExecStart=/usr/bin/fleetd - Restart=always - RestartSec=10s - name: etcd-waiter.service command: start content: | @@ -159,7 +143,7 @@ coreos: --logtostderr=true Restart=always RestartSec=10 - - name: kube-controller-manager.service + - name: kube-controller-manager.service command: start content: | [Unit] diff --git a/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml index a8391dfbe0ff4..0cd47e9c21091 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/node.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/node.yaml @@ -1,23 +1,14 @@ #cloud-config coreos: + fleet: + etcd-servers: http://:4001 + metadata: "role=node" units: - name: etcd.service mask: true - name: fleet.service command: start - content: | - [Unit] - Description=fleet daemon - Wants=fleet.socket - After=fleet.socket - - [Service] - Environment="FLEET_ETCD_SERVERS=http://:4001" - Environment="FLEET_METADATA=role=node" - ExecStart=/usr/bin/fleetd - Restart=always - RestartSec=10s - name: flannel.service command: start content: |