From 462635d603facfe88c63cdcc9791252a836be522 Mon Sep 17 00:00:00 2001 From: Alex Polvi Date: Thu, 20 Mar 2014 20:34:29 -0700 Subject: [PATCH] wip, start coreos-setup-environment in the right order --- .../coreos-cloudinit/files/coreos-cloudinit-oem.service | 3 --- .../coreos-base/oem-rackspace/files/cloud-config.yml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service index 2731b2d2ed..930f82385e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service @@ -2,14 +2,11 @@ Description=coreos-cloudinit for /usr/share/oem/cloud-config.yml Requires=dbus.service After=dbus.service -Requires=coreos-setup-environment.service -After=coreos-setup-environment.service RequiresMountsFor=/usr/share/oem ConditionPathExists=/usr/share/oem/cloud-config.yml [Service] Type=oneshot -EnvironmentFile=/etc/environment ExecStartPre=/usr/bin/coreos-cloudinit --from-file=/usr/share/oem/cloud-config.yml ExecStart=/usr/bin/systemctl daemon-reload 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 b92995778a..9616e04d03 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 @@ -33,7 +33,10 @@ coreos: content: | [Unit] RequiresMountsFor=/media/configdrive + Requires=coreos-setup-environment.service + After=coreos-setup-environment.service [Service] Type=oneshot + EnvironmentFile=/etc/environment ExecStart=/usr/bin/coreos-cloudinit --from-file=/media/configdrive/openstack/latest/user_data