From 724569fd54dbab6965c9e933016e897f53e118e2 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 13 Jun 2017 15:33:32 -0700 Subject: [PATCH] coreos-base/oem-{cloudsigma,rackspace}: drop etcd.service drop-in etcd v0 has been removed from Container Linux. --- .../coreos-base/oem-cloudsigma/files/cloud-config.yml | 8 -------- .../coreos-base/oem-rackspace/files/cloud-config.yml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml index 665dccafe0..04ee4b8d09 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml @@ -2,14 +2,6 @@ coreos: units: - - name: etcd.service - runtime: true - drop-ins: - - name: 10-oem.conf - content: | - [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 - - name: etcd2.service runtime: true drop-ins: diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml index 83f3380a7d..3c356a5491 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml @@ -2,14 +2,6 @@ coreos: units: - - name: etcd.service - runtime: true - drop-ins: - - name: 10-oem.conf - content: | - [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 - - name: etcd2.service runtime: true drop-ins: