mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-05 17:32:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1223 from crawford/etcd2

Browse Source 
oem-*: fix etcd2 peer election option
This commit is contained in:
Alex Crawford 2015-04-24 14:33:16 -07:00
commit 4a25ea0f41
8 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml vendored
View File

@ -16,7 +16,7 @@ coreos:
- name: 10-oem.conf - name: 10-oem.conf
content: | content: |
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_ELECTION_TIMEOUT=1200
- name: waagent.service - name: waagent.service
command: start command: start

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r1.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-2.0.11-r2.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml vendored
View File

@ -16,7 +16,7 @@ coreos:
- name: 10-oem.conf - name: 10-oem.conf
content: | content: |
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_ELECTION_TIMEOUT=1200
- name: oem-cloudinit.service - name: oem-cloudinit.service
command: restart command: restart

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.1-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml vendored
View File

@ -16,7 +16,7 @@ coreos:
- name: 10-oem.conf - name: 10-oem.conf
content: | content: |
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_ELECTION_TIMEOUT=1200
- name: user-configdrive.service - name: user-configdrive.service
mask: yes mask: yes

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml vendored
View File

@ -16,7 +16,7 @@ coreos:
- name: 10-oem.conf - name: 10-oem.conf
content: | content: |
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_ELECTION_TIMEOUT=1200
- name: nova-agent-auto.service - name: nova-agent-auto.service
command: restart command: restart

0
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r9.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r10.ebuild vendored
View File