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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit-oem.service vendored
View File

@ -2,14 +2,11 @@
Description=coreos-cloudinit for /usr/share/oem/cloud-config.yml Description=coreos-cloudinit for /usr/share/oem/cloud-config.yml
Requires=dbus.service Requires=dbus.service
After=dbus.service After=dbus.service
Requires=coreos-setup-environment.service
After=coreos-setup-environment.service
RequiresMountsFor=/usr/share/oem RequiresMountsFor=/usr/share/oem
ConditionPathExists=/usr/share/oem/cloud-config.yml ConditionPathExists=/usr/share/oem/cloud-config.yml
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/environment
ExecStartPre=/usr/bin/coreos-cloudinit --from-file=/usr/share/oem/cloud-config.yml ExecStartPre=/usr/bin/coreos-cloudinit --from-file=/usr/share/oem/cloud-config.yml
ExecStart=/usr/bin/systemctl daemon-reload ExecStart=/usr/bin/systemctl daemon-reload

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

@ -33,7 +33,10 @@ coreos:
content: | content: |
[Unit] [Unit]
RequiresMountsFor=/media/configdrive RequiresMountsFor=/media/configdrive
Requires=coreos-setup-environment.service
After=coreos-setup-environment.service
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/environment
ExecStart=/usr/bin/coreos-cloudinit --from-file=/media/configdrive/openstack/latest/user_data ExecStart=/usr/bin/coreos-cloudinit --from-file=/media/configdrive/openstack/latest/user_data