mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 15:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

overlay coreos-base/oem-ec2-compat: drop ec2 use

Browse Source 
while this ebuild will be dropped in the near future, we still need to
maintain openstack ebuild.

`flatcar-eks` was a runtime dependency of openstack/brightbox too. I
think it was a mistake ?

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Mathieu Tortuyaux 2023-08-29 14:43:06 +02:00
parent ce2c0e7475
commit 9205ac98e0
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
2 changed files with 4 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign vendored
View File

@ -1,46 +0,0 @@
{
"ignition": {
"version": "2.1.0"
},
"systemd": {
"units": [
{
"name": "coreos-metadata-sshkeys@.service",
"enabled": true
},
{
"name": "amazon-ssm-agent.service",
"enabled": true,
"contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/oem\nExecStart=/oem/bin/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n"
}
]
},
"storage": {
"files": [
{
"filesystem": "root",
"path": "/etc/amazon/ssm/amazon-ssm-agent.json",
"contents": {
"source": "oem:///ssm/amazon-ssm-agent.json.template"
},
"mode": 292
},
{
"filesystem": "root",
"path": "/etc/amazon/ssm/seelog.xml",
"contents": {
"source": "oem:///ssm/seelog.xml.template"
},
"mode": 292
},
{
"filesystem": "root",
"path": "/etc/eks/bootstrap.sh",
"contents": {
"source": "oem:///eks/bootstrap.sh"
},
"mode": 493
}
]
}
}

23
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r3.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r4.ebuild vendored
View File

@ -10,24 +10,15 @@ SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 arm64 x86"
IUSE="ec2 openstack brightbox"
REQUIRED_USE="^^ ( ec2 openstack brightbox )"
RDEPEND="
ec2? ( app-emulation/amazon-ssm-agent )
coreos-base/flatcar-eks
"
IUSE="openstack brightbox"
REQUIRED_USE="^^ ( openstack brightbox )"
# no source directory
S="${WORKDIR}"
src_prepare() {
default
if use ec2 ; then
ID="ami"
NAME="Amazon EC2"
HOME_URL="http://aws.amazon.com/ec2/"
elif use openstack ; then
if use openstack ; then
ID="openstack"
NAME="Openstack"
HOME_URL="https://www.openstack.org/"
@ -49,9 +40,7 @@ src_prepare() {
src_install() {
insinto "/oem"
doins "${T}/oem-release"
if use ec2 ; then
newins "${FILESDIR}/grub-ec2.cfg" grub.cfg
elif use openstack ; then
if use openstack ; then
newins "${FILESDIR}/grub-openstack.cfg" grub.cfg
elif use brightbox ; then
newins "${FILESDIR}/grub-brightbox.cfg" grub.cfg
@ -59,10 +48,6 @@ src_install() {
insinto "/oem/base"
doins "${FILESDIR}/base/README"
if use ec2 ; then
newins "${FILESDIR}/base/base-ec2.ign" base.ign
fi
if use openstack; then
newins "${FILESDIR}/base/openstack.ign" base.ign
fi