From fbea7166049dbbe381ef95f59e15bbb8aed08d90 Mon Sep 17 00:00:00 2001 From: Rob Szumski Date: Thu, 3 Apr 2014 23:53:56 -0700 Subject: [PATCH] feat(oem): populate /etc/oem-release --- .../coreos-base/oem-ami/files/cloud-config.yml | 6 +++++- .../{oem-ami-0.0.1-r12.ebuild => oem-ami-0.0.1-r13.ebuild} | 0 .../coreos-base/oem-gce/files/cloud-config.yml | 5 +++++ .../coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild | 1 + .../{oem-gce-0.0.2-r2.ebuild => oem-gce-0.0.2.ebuild} | 0 .../coreos-base/oem-rackspace/files/cloud-config.yml | 5 +++++ ...kspace-0.0.1-r4.ebuild => oem-rackspace-0.0.1-r5.ebuild} | 0 .../coreos-base/oem-vagrant/files/cloud-config.yml | 5 +++++ ...-vagrant-0.0.1-r5.ebuild => oem-vagrant-0.0.1-r6.ebuild} | 0 9 files changed, 21 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/{oem-ami-0.0.1-r12.ebuild => oem-ami-0.0.1-r13.ebuild} (100%) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/{oem-gce-0.0.2-r2.ebuild => oem-gce-0.0.2.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/{oem-rackspace-0.0.1-r4.ebuild => oem-rackspace-0.0.1-r5.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/{oem-vagrant-0.0.1-r5.ebuild => oem-vagrant-0.0.1-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml index bb5756c948..065b2a33e3 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml @@ -40,7 +40,11 @@ coreos: Type=oneshot RemainAfterExit=no ExecStart=/usr/share/oem/bin/coreos-c10n - + oem: + id: ami + name: Amazon EC2 + home-url: http://aws.amazon.com/ec2/ + bug-report-url: https://github.com/coreos/coreos-overlay write_files: - path: /run/systemd/system/etcd.service.d/10-oem.conf permissions: 0644 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r13.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r12.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/oem-ami-0.0.1-r13.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml index 62fbdd325d..5ff734bf36 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/cloud-config.yml @@ -92,3 +92,8 @@ coreos: [Install] WantedBy=multi-user.target + oem: + id: gce + name: Google Compute Engine + home-url: https://cloud.google.com/products/compute-engine/ + bug-report-url: https://github.com/coreos/coreos-overlay diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild new file mode 120000 index 0000000000..a70b09de78 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r3.ebuild @@ -0,0 +1 @@ +oem-gce-0.0.2.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.2.ebuild 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 eedfd199e2..0d609db662 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 @@ -48,3 +48,8 @@ coreos: 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 + home-url: https://www.rackspace.com/cloud/servers/ + bug-report-url: https://github.com/coreos/coreos-overlay diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1-r5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml index b67245b11f..529a4b16ab 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml @@ -21,3 +21,8 @@ coreos: EnvironmentFile=-/etc/environment ExecStart=/usr/bin/coreos-cloudinit --from-file /var/lib/coreos-vagrant/user-data RemainAfterExit=yes + oem: + id: vagrant + name: Vagrant + home-url: http://www.vagrantup.com/ + bug-report-url: https://github.com/coreos/coreos-overlay diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/oem-vagrant-0.0.1-r6.ebuild