Merge branch 'rackspace-oem' of https://github.com/polvi/coreos-overlay into rackspace-oem

This commit is contained in:
Alex Polvi 2014-03-21 03:35:16 +00:00
commit 94e3404c2c
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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