From 26767b01aa6015b8d71f19ba76f26c0a6a814c64 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 3 Aug 2021 12:55:08 +0000 Subject: [PATCH] Revert "Revert "Build app-emulation/amazon-ssm-agent with EC2 AMI images"" Now that the OEM partition is a btrfs partition with compression, we have enough space to install ssm agent. This reverts commit b6abb59c544be13e923a3e7240b5c9395c281fca. Signed-off-by: Jeremi Piotrowski --- .../oem-ec2-compat/files/base/base-ec2.ign | 25 +++++++++++++++++++ .../oem-ec2-compat-0.1.2.ebuild | 4 +++ 2 files changed, 29 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign index bfcfd84e05..dd5ce9670a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/base/base-ec2.ign @@ -7,6 +7,31 @@ { "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=/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 } ] } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild index 7d029caff1..1e8993049a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2.ebuild @@ -26,6 +26,10 @@ RDEPEND=" ) " +RDEPEND=" + app-emulation/amazon-ssm-agent +" + # no source directory S="${WORKDIR}"