From 34af23e3a302f1763eb63f238c3086c6bcec6f13 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Mon, 17 Mar 2014 16:22:20 -0700 Subject: [PATCH] content instead of contents --- .../coreos-base/oem-ami/files/cloud-config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml index d312630dd8..1f8e941114 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml @@ -15,11 +15,15 @@ coreos: - name: ec2-cloudinit.service runtime: yes content: | + [Service] + Requires=coreos-setup-environment.service + After=coreos-setup-environment.service [Unit] Description=Cloudinit from EC2 metadata [Service] Type=oneshot + EnvironmentFile=/etc/environment ExecStart=/usr/bin/coreos-cloudinit -from-url=http://169.254.169.254/latest/user-data - name: ec2-c10n.service runtime: yes @@ -36,6 +40,7 @@ coreos: write_files: - path: /etc/systemd/system/etcd.service.d/10-oem.conf - contents: | + permissions: 0644 + content: | [Service] Environment=ETCD_PEER_ELECTION_TIMEOUT=1200