coreos-base/oem-rackspace-teeth: Make cloudinit drop-in an actual unit

This will guarentee that cloudinit reloads systemd's unit files.
Also, fix the ordering on the config-drive mount.
This commit is contained in:
Alex Crawford 2014-06-16 11:41:47 -07:00
parent c9028e3d53
commit bcc54c5b45

View File

@ -1,23 +1,20 @@
#cloud-config #cloud-config
write_files: coreos:
- path: /run/systemd/system/user-configdrive.service.d/netconf.conf units:
permissions: 0644 - name: user-configdrive.service.d/netconf.conf
runtime: yes
content: | content: |
[Service] [Service]
ExecStart= ExecStart=
ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --convert-netconf=debian ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --convert-netconf=debian
coreos:
units:
- name: media-configdrive.mount - name: media-configdrive.mount
command: start command: start
runtime: yes runtime: yes
content: | content: |
[Unit] [Unit]
DefaultDependencies=no Wants=user-configdrive.service
Conflicts=umount.target Before=user-configdrive.service
Before=local-fs.target umount.target
[Mount] [Mount]
What=/dev/disk/by-label/config-2 What=/dev/disk/by-label/config-2