From 400e754b617730ce79ae764ba9eb53a05024e66d Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 24 Apr 2015 10:59:30 -0700 Subject: [PATCH] oem-*: fix etcd2 peer election option --- .../coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml | 2 +- .../{oem-azure-2.0.11-r1.ebuild => oem-azure-2.0.11-r2.ebuild} | 0 .../coreos-base/oem-cloudsigma/files/cloud-config.yml | 2 +- ...m-cloudsigma-0.0.1.ebuild => oem-cloudsigma-0.0.1-r1.ebuild} | 0 .../coreos-base/oem-ec2-compat/files/cloud-config.yml | 2 +- ...m-ec2-compat-0.0.3.ebuild => oem-ec2-compat-0.0.3-r1.ebuild} | 0 .../coreos-base/oem-rackspace/files/cloud-config.yml | 2 +- ...rackspace-0.0.1-r9.ebuild => oem-rackspace-0.0.1-r10.ebuild} | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-2.0.11-r1.ebuild => oem-azure-2.0.11-r2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/{oem-cloudsigma-0.0.1.ebuild => oem-cloudsigma-0.0.1-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.3.ebuild => oem-ec2-compat-0.0.3-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.1-r9.ebuild => oem-rackspace-0.0.1-r10.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml index 6aa595889c..2b48713355 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml @@ -16,7 +16,7 @@ coreos: - name: 10-oem.conf content: | [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 + Environment=ETCD_ELECTION_TIMEOUT=1200 - name: waagent.service command: start diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r2.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 e4a20e9f1a..7302162e3c 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 @@ -16,7 +16,7 @@ coreos: - name: 10-oem.conf content: | [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 + Environment=ETCD_ELECTION_TIMEOUT=1200 - name: oem-cloudinit.service command: restart diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml index d631e625e7..62a2a0ab7e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml @@ -16,7 +16,7 @@ coreos: - name: 10-oem.conf content: | [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 + Environment=ETCD_ELECTION_TIMEOUT=1200 - name: user-configdrive.service mask: yes diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-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 b2e5969f67..02e668ce37 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 @@ -16,7 +16,7 @@ coreos: - name: 10-oem.conf content: | [Service] - Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 + Environment=ETCD_ELECTION_TIMEOUT=1200 - name: nova-agent-auto.service command: restart diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild