From 1659d190b09579a083b35380fac31726ab862d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Thu, 7 Mar 2024 17:14:56 +0100 Subject: [PATCH] Packer: set 'cloudwatch_group' in worker config if provided MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set the 'cloudwatch_group' value in the worker configuration if provided in /tmp/cloud_init_vars, so that it is used by the worker when spinning up an osbuild-executor instance. Signed-off-by: Tomáš Hozza --- .../files/worker-initialization-scripts/worker_config.sh | 8 ++++++++ .../worker-initialization-scripts/worker_executor.sh | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_config.sh b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_config.sh index e15ebcd13..1ab30d7be 100755 --- a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_config.sh +++ b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_config.sh @@ -5,8 +5,16 @@ source /tmp/cloud_init_vars echo "Writing osbuild_executor config to worker configuration." OSBUILD_EXECUTOR_IAM_PROFILE=${OSBUILD_EXECUTOR_IAM_PROFILE:-osbuild-executor} +OSBUILD_EXECUTOR_CLOUDWATCH_GROUP=${OSBUILD_EXECUTOR_CLOUDWATCH_GROUP:-} + +CLOUDWATCH_GROUP_CONFIG="" +if [ -n "${OSBUILD_EXECUTOR_CLOUDWATCH_GROUP}" ]; then + CLOUDWATCH_GROUP_CONFIG="cloudwatch_group = \"${OSBUILD_EXECUTOR_CLOUDWATCH_GROUP}\"\n" +fi + sudo tee -a /etc/osbuild-worker/osbuild-worker.toml > /dev/null << EOF [osbuild_executor] type = "aws.ec2" iam_profile = "${OSBUILD_EXECUTOR_IAM_PROFILE}" +${CLOUDWATCH_GROUP_CONFIG} EOF diff --git a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_executor.sh b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_executor.sh index c3ca61d92..c31e9b18c 100755 --- a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_executor.sh +++ b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_executor.sh @@ -2,8 +2,8 @@ set -euo pipefail source /etc/os-release -# TODO: uncomment, when the cloud_init_vars file is created on the executor -#source /tmp/cloud_init_vars +# /tmp/cloud_init_vars may not exist on the osbuild-executor +source /tmp/cloud_init_vars || true # Don't subscribe on fedora if [ "$ID" != fedora ]; then