From 6448bf8198edcb4683523c81a365c5d84e757334 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 11 Sep 2014 17:50:10 -0700 Subject: [PATCH 1/3] coreos-base/oem-digitalocean: use --oem flag --- .../coreos-base/oem-digitalocean/files/cloud-config.yml | 2 +- ...gitalocean-0.0.1-r1.ebuild => oem-digitalocean-0.0.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/{oem-digitalocean-0.0.1-r1.ebuild => oem-digitalocean-0.0.2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml index 556d2f8f7e..2fce7acc84 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml @@ -21,7 +21,7 @@ coreos: [Service] Type=oneshot - ExecStart=/usr/bin/coreos-cloudinit --from-digitalocean-metadata=http://169.254.169.254/ --convert-netconf=digitalocean + ExecStart=/usr/bin/coreos-cloudinit --oem=digitalocean oem: id: digitalocean name: DigitalOcean diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.2.ebuild From cc7bd7a792045255b49c15a3d74fc16d784e1378 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 11 Sep 2014 17:51:50 -0700 Subject: [PATCH 2/3] coreos-base/oem-ec2-compat: use --oem flag --- .../coreos-base/oem-ec2-compat/files/cloud-config.yml | 2 +- ...m-ec2-compat-0.0.2-r3.ebuild => oem-ec2-compat-0.0.3.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.2-r3.ebuild => oem-ec2-compat-0.0.3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml index a5f393e469..4d47a149c9 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml @@ -15,7 +15,7 @@ coreos: [Service] Type=oneshot - ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --from-ec2-metadata=http://169.254.169.254/ + ExecStart=/usr/bin/coreos-cloudinit --oem=ec2-compat oem: id: @@OEM_ID@@ name: @@OEM_NAME@@ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3.ebuild From 0a00950f62ad2f7ec6b68d7d692e8b0be9ba8a15 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 11 Sep 2014 17:52:54 -0700 Subject: [PATCH 3/3] coreos-base/oem-rackspace-onmetal: use --oem flag --- .../coreos-base/oem-rackspace-onmetal/files/cloud-config.yml | 2 +- ...metal-0.0.3-r1.ebuild => oem-rackspace-onmetal-0.0.4.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/{oem-rackspace-onmetal-0.0.3-r1.ebuild => oem-rackspace-onmetal-0.0.4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml index 4d59798a67..5b805e12b7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/files/cloud-config.yml @@ -21,7 +21,7 @@ coreos: content: | [Service] ExecStart= - ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --convert-netconf=debian + ExecStart=/usr/bin/coreos-cloudinit --oem=rackspace-onmetal - name: ping-out.service runtime: yes enable: yes diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace-onmetal/oem-rackspace-onmetal-0.0.4.ebuild