mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-21 22:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreos-base/oem-*: clean up OEM cloud-configs

Browse Source 
Use coreos.units instead of write_files for writing the etcd dropins.
Clean up the indentation of the config.
This commit is contained in:
Alex Crawford 2015-04-08 11:54:59 -07:00
parent 24873ccad4
commit 256841ed4d
4 changed files with 85 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,14 @@
coreos:
units:
- name: etcd.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: waagent.service
command: start
runtime: true
@ -34,10 +42,3 @@ coreos:
version-id: @@OEM_VERSION_ID@@
home-url: https://azure.microsoft.com/
bug-report-url: https://github.com/coreos/bugs/issues
write_files:
- path: /run/systemd/system/etcd.service.d/10-oem.conf
permissions: 0644
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200

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

@ -2,6 +2,14 @@
coreos:
units:
- name: etcd.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: oem-cloudinit.service
command: restart
runtime: yes
@ -12,16 +20,10 @@ coreos:
[Service]
Type=oneshot
ExecStart=/usr/bin/coreos-cloudinit --oem=cloudsigma
oem:
id: cloudsigma
name: CloudSigma
version-id: @@OEM_VERSION_ID@@
home-url: https://www.cloudsigma.com/
bug-report-url: https://github.com/coreos/bugs/issues
write_files:
- path: /run/systemd/system/etcd.service.d/10-oem.conf
permissions: 0644
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200

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

@ -2,10 +2,20 @@
coreos:
units:
- name: etcd.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: user-configdrive.service
mask: yes
- name: user-configvirtfs.service
mask: yes
- name: oem-cloudinit.service
command: restart
runtime: yes
@ -16,15 +26,10 @@ coreos:
[Service]
Type=oneshot
ExecStart=/usr/bin/coreos-cloudinit --oem=ec2-compat
oem:
id: @@OEM_ID@@
name: @@OEM_NAME@@
version-id: @@OEM_VERSION_ID@@
home-url: @@OEM_HOME_URL@@
bug-report-url: https://github.com/coreos/bugs/issues
write_files:
- path: /run/systemd/system/etcd.service.d/10-oem.conf
permissions: 0644
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200

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

@ -2,6 +2,14 @@
coreos:
units:
- name: etcd.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: nova-agent-auto.service
command: restart
runtime: yes
@ -28,15 +36,10 @@ coreos:
[Service]
ExecStart=/usr/share/oem/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/bin/
oem:
id: rackspace
name: Rackspace Cloud Servers
version-id: @@OEM_VERSION_ID@@
home-url: https://www.rackspace.com/cloud/servers/
bug-report-url: https://github.com/coreos/coreos-overlay
write_files:
- path: /run/systemd/system/etcd.service.d/10-oem.conf
permissions: 0644
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
bug-report-url: https://github.com/coreos/bugs/issues