From 8d2164c922ca1ecb596d798ae9a49ff3cb2e05cd Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 3 Apr 2014 17:06:54 -0700 Subject: [PATCH] fix(coreos-base/oem-rackspace): Rely on generic configdrive units. Config drive is now supported on all VM platforms so it doesn't need to be in the rackspace OEM any more. --- .../oem-rackspace/files/cloud-config.yml | 20 ------------------- ...7.ebuild => oem-rackspace-0.0.1-r8.ebuild} | 0 2 files changed, 20 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.1-r7.ebuild => oem-rackspace-0.0.1-r8.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml index 81638f49f4..14161d6575 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/cloud-config.yml +++ b/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 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r7.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r8.ebuild