Merge pull request #547 from marineam/units2

Generic config drive

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild

@@ -9,11 +9,11 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64"
 else
-	CROS_WORKON_COMMIT="0fddd1735d013b6e6c78b232329c0ea4d5b709be"  # v0.4.0
+	CROS_WORKON_COMMIT="13a3d892ca557c7474fdb17a7562697a05464290"  # v0.4.2
 	KEYWORDS="amd64"
 fi
 
-inherit cros-workon systemd
+inherit cros-workon systemd udev
 
 DESCRIPTION="coreos-cloudinit"
 HOMEPAGE="https://github.com/coreos/coreos-cloudinit"
@@ -36,7 +36,9 @@ src_compile() {
 
 src_install() {
 	dobin ${S}/bin/coreos-cloudinit
-	systemd_dounit "${FILESDIR}"/coreos-cloudinit@.service
-	systemd_dounit "${FILESDIR}"/cloud-config.target
-	systemd_enable_service default.target cloud-config.target
+	udev_dorules units/*.rules
+	systemd_dounit units/*.service
+	systemd_dounit units/*.target
+	systemd_enable_service default.target system-config.target
+	systemd_enable_service default.target user-config.target
 }

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/cloud-config.target

@@ -1,9 +0,0 @@
-[Unit]
-# Load OEM and coreos-install cloud-configs by default
-Requires=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service
-After=coreos-cloudinit@usr-share-oem-cloud\x2dconfig.yml.service
-Requires=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service
-After=coreos-cloudinit@var-lib-coreos\x2dinstall-user_data.service
-
-[Install]
-WantedBy=multi-user.target

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/files/coreos-cloudinit@.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Load cloud-config from %f
-Requires=dbus.service
-After=dbus.service
-RequiresMountsFor=%f
-ConditionFileNotEmpty=%f
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/coreos-cloudinit --from-file=%f
- 
-[Install]
-WantedBy=cloud-config.target

sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild

@@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~x86"
 else
-	CROS_WORKON_COMMIT="c8b9546f43336fc6fcb4e3a6f7953273599f74af"
+	CROS_WORKON_COMMIT="c7db6522790cb82789b0b6e579eeb49a17ca61bf"
 	KEYWORDS="amd64 arm x86"
 fi
 

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml

@@ -28,26 +28,6 @@ coreos:
 
           [Service]
           ExecStart=/usr/share/oem/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/bin/
-      - name: media-configdrive.mount
-        command: restart
-        runtime: yes
-        content: |
-          [Mount]
-          What=/dev/disk/by-label/config-2
-          Where=/media/configdrive
-      - name: cloudinit-configdrive.service
-        command: restart
-        runtime: yes
-        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
     oem:
       id: rackspace
       name: Rackspace Cloud Servers

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml

@@ -7,20 +7,7 @@ coreos:
         content: |
           [Path]
           PathExists=/var/lib/coreos-vagrant/user-data
-
-          [Install]
-          WantedBy=multi-user.target
-      - name: coreos-cloudinit-vagrant.service
-        runtime: no
-        content: |
-          [Unit]
-          ConditionFileNotEmpty=/var/lib/coreos-vagrant/user-data
-
-          [Service]
-          Type=oneshot
-          EnvironmentFile=-/etc/environment
-          ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data
-          RemainAfterExit=yes
+          Unit=user-cloudinit@var-lib-coreos\x2dvagrant-user\x2ddata.service
     oem:
       id: vagrant
       name: Vagrant