Merge pull request #510 from flatcar-linux/kai/amazon-aws-agent

Build amazon-ssm-agent package but disable it for now
This commit is contained in:
Kai Lüke 2020-08-03 19:12:54 +02:00 committed by GitHub
commit acf53beabb
3 changed files with 7 additions and 28 deletions

View File

@ -7,31 +7,6 @@
{ {
"name": "coreos-metadata-sshkeys@.service", "name": "coreos-metadata-sshkeys@.service",
"enabled": true "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=/usr/share/oem\nExecStart=/usr/share/oem/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
} }
] ]
} }

View File

@ -13,9 +13,12 @@ KEYWORDS="amd64 arm64 x86"
IUSE="ec2 openstack brightbox" IUSE="ec2 openstack brightbox"
REQUIRED_USE="^^ ( ec2 openstack brightbox )" REQUIRED_USE="^^ ( ec2 openstack brightbox )"
RDEPEND=" # TODO: The AWS SSM Agent is currently too big for the OEM partition
app-emulation/amazon-ssm-agent # but if it fits, uncomment the following and revert
" # b6abb59c544be13e923a3e7240b5c9395c281fca
#RDEPEND="
# ec2? ( app-emulation/amazon-ssm-agent )
#"
# no source directory # no source directory
S="${WORKDIR}" S="${WORKDIR}"

View File

@ -31,6 +31,7 @@ RDEPEND="
sys-boot/grub sys-boot/grub
sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf
) )
app-emulation/amazon-ssm-agent
coreos-base/coreos coreos-base/coreos
coreos-base/coreos-dev coreos-base/coreos-dev
" "