coreos-base/oem-ec2-compat: drop cloud-config

Ignition (starting with 0.14.0) will apply this configuration instead.
This commit is contained in:
Alex Crawford 2017-03-01 16:42:12 -08:00
parent 525ede98d7
commit 1e1c682121
3 changed files with 7 additions and 45 deletions

View File

@ -1,43 +0,0 @@
#cloud-config
coreos:
units:
- name: etcd.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_PEER_ELECTION_TIMEOUT=1200
- name: etcd2.service
runtime: true
drop-ins:
- name: 10-oem.conf
content: |
[Service]
Environment=ETCD_ELECTION_TIMEOUT=1200
- name: user-configdrive.service
mask: yes
- name: user-configvirtfs.service
mask: yes
- name: oem-cloudinit.service
command: restart
runtime: yes
content: |
[Unit]
Description=Cloudinit from EC2-style metadata
[Service]
Type=oneshot
ExecStart=/usr/bin/coreos-cloudinit --oem=ec2-compat
oem:
id: @@OEM_ID@@
name: @@OEM_NAME@@
version-id: @@OEM_VERSION_ID@@
home-url: @@OEM_HOME_URL@@
bug-report-url: https://issues.coreos.com

View File

@ -0,0 +1,5 @@
ID=@@OEM_ID@@
VERSION_ID=@@OEM_VERSION_ID@@
NAME="@@OEM_NAME@@"
HOME_URL="@@OEM_HOME_URL@@"
BUG_REPORT_URL="https://issues.coreos.com"

View File

@ -37,12 +37,12 @@ src_prepare() {
-e "s\\@@OEM_NAME@@\\${NAME}\\g" \
-e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
-e "s\\@@OEM_HOME_URL@@\\${HOME_URL}\\g" \
"${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die
"${FILESDIR}/oem-release" > "${T}/oem-release" || die
}
src_install() {
insinto "/usr/share/oem"
doins "${T}/cloud-config.yml"
doins "${T}/oem-release"
if use ec2 ; then
newins "${FILESDIR}/grub-ec2.cfg" grub.cfg
elif use openstack ; then