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

Merge branch 'etcd-refactor' of https://github.com/polvi/coreos-overlay into etcd-refactor

Browse Source 
Conflicts:
	coreos-base/oem-ami/files/cloud-config.yml
This commit is contained in:
Alex Polvi 2014-03-17 23:24:12 +00:00
commit d9e5aa902f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,15 @@ coreos:
- name: ec2-cloudinit.service - name: ec2-cloudinit.service
runtime: yes runtime: yes
content: | content: |
[Service]
Requires=coreos-setup-environment.service
After=coreos-setup-environment.service
[Unit] [Unit]
Description=Cloudinit from EC2 metadata Description=Cloudinit from EC2 metadata
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/environment
ExecStart=/usr/bin/coreos-cloudinit -from-url=http://169.254.169.254/latest/user-data ExecStart=/usr/bin/coreos-cloudinit -from-url=http://169.254.169.254/latest/user-data
- name: ec2-c10n.service - name: ec2-c10n.service
runtime: yes runtime: yes
@ -36,6 +40,7 @@ coreos:
write_files: write_files:
- path: /etc/systemd/system/etcd.service.d/10-oem.conf - path: /etc/systemd/system/etcd.service.d/10-oem.conf
contents: | permissions: 0644
content: |
[Service] [Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200 Environment=ETCD_PEER_ELECTION_TIMEOUT=1200