feat(units): Add generic cloudinit path unit

Switch to triggering common user configs via a path unit. This is
particularly useful for config drive so that a config drive can be
mounted by something other than the udev triggered services, a bind
mount when running in a container for example.
This commit is contained in:
Michael Marineau 2014-05-16 19:44:57 -07:00
parent 140682350d
commit f83ce07416
4 changed files with 10 additions and 11 deletions

View File

@ -5,10 +5,6 @@ ConditionPathIsMountPoint=!/media/configdrive
# Only mount config drive block devices automatically in virtual machines # Only mount config drive block devices automatically in virtual machines
ConditionVirtualization=vm ConditionVirtualization=vm
# OpenStack defined config drive so they get to stick their name in it
Wants=user-cloudinit@media-configdrive-openstack-latest-user_data.service
Before=user-cloudinit@media-configdrive-openstack-latest-user_data.service
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=no RemainAfterExit=no

View File

@ -4,10 +4,6 @@ Conflicts=configdrive-block.service umount.target
ConditionPathIsMountPoint=!/media/configdrive ConditionPathIsMountPoint=!/media/configdrive
ConditionVirtualization=vm ConditionVirtualization=vm
# OpenStack defined config drive so they get to stick their name in it
Wants=user-cloudinit@media-configdrive-openstack-latest-user_data.service
Before=user-cloudinit@media-configdrive-openstack-latest-user_data.service
# Support old style setup for now # Support old style setup for now
Wants=addon-run@media-configdrive.service addon-config@media-configdrive.service Wants=addon-run@media-configdrive.service addon-config@media-configdrive.service
Before=addon-run@media-configdrive.service addon-config@media-configdrive.service Before=addon-run@media-configdrive.service addon-config@media-configdrive.service

View File

@ -0,0 +1,5 @@
[Unit]
Description=Watch for a cloud-config at %f
[Path]
PathExists=%f

View File

@ -3,9 +3,11 @@ Description=Load user-provided cloud configs
Requires=system-config.target Requires=system-config.target
After=system-config.target After=system-config.target
# Load user_data placed by coreos-install # Watch for configs at a couple common paths
Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service Requires=user-cloudinit@media-configdrive-openstack-latest-user_data.path
After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service After=user-cloudinit@media-configdrive-openstack-latest-user_data.path
Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path
After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.path
Requires=user-cloudinit-proc-cmdline.service Requires=user-cloudinit-proc-cmdline.service
After=user-cloudinit-proc-cmdline.service After=user-cloudinit-proc-cmdline.service