From 30b8fa171a824073be75cac9fe45999a62fa01c9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 25 Jan 2018 10:49:04 -0800 Subject: [PATCH] coreos-base/oem-*: drop etcd2 drop-ins --- .../coreos-base/oem-azure/files/base/base.ign | 9 --------- ...m-azure-2.2.4-r3.ebuild => oem-azure-2.2.4-r4.ebuild} | 0 .../coreos-base/oem-cloudsigma/files/cloud-config.yml | 8 -------- ...ma-0.0.3-r1.ebuild => oem-cloudsigma-0.0.3-r2.ebuild} | 0 .../coreos-base/oem-ec2-compat/files/base/base-ec2.ign | 9 --------- ...ompat-0.1.1.ebuild => oem-ec2-compat-0.1.1-r1.ebuild} | 0 .../coreos-base/oem-rackspace/files/cloud-config.yml | 8 -------- ...ace-0.0.4-r1.ebuild => oem-rackspace-0.0.4-r2.ebuild} | 0 8 files changed, 34 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.2.4-r3.ebuild => oem-azure-2.2.4-r4.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/{oem-cloudsigma-0.0.3-r1.ebuild => oem-cloudsigma-0.0.3-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.1.1.ebuild => oem-ec2-compat-0.1.1-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.4-r1.ebuild => oem-rackspace-0.0.4-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign index 105cd4311c..f222e5180a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/base/base.ign @@ -19,15 +19,6 @@ { "name": "waagent.service", "enabled": true - }, - { - "name": "etcd2.service", - "dropins": [ - { - "name": "10-oem.conf", - "contents": "[Service]\nEnvironment=ETCD_ELECTION_TIMEOUT=1200\n" - } - ] } ] } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.2.4-r4.ebuild 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 04ee4b8d09..2198eec548 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: etcd2.service - runtime: true - drop-ins: - - name: 10-oem.conf - content: | - [Service] - Environment=ETCD_ELECTION_TIMEOUT=1200 - - name: oem-cloudinit.service command: restart runtime: yes diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign index f3bb58782e..bfcfd84e05 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign @@ -7,15 +7,6 @@ { "name": "coreos-metadata-sshkeys@.service", "enabled": true - }, - { - "name": "etcd2.service", - "dropins": [ - { - "name": "10-oem.conf", - "contents": "[Service]\nEnvironment=ETCD_ELECTION_TIMEOUT=1200\n" - } - ] } ] } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.1-r1.ebuild 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 3c356a5491..687ec0214d 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: etcd2.service - runtime: true - drop-ins: - - name: 10-oem.conf - content: | - [Service] - Environment=ETCD_ELECTION_TIMEOUT=1200 - - name: nova-agent-auto.service command: restart runtime: yes diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.4-r2.ebuild