diff --git a/templates/packer/ansible/roles/common/files/osbuild-worker.toml b/templates/packer/ansible/roles/common/files/osbuild-worker.toml new file mode 100644 index 000000000..6942eed69 --- /dev/null +++ b/templates/packer/ansible/roles/common/files/osbuild-worker.toml @@ -0,0 +1 @@ +base_path = "/api/image-builder-worker/v1" diff --git a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/offline_token.sh b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/offline_token.sh index 1c7d84fad..9e203b640 100755 --- a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/offline_token.sh +++ b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/offline_token.sh @@ -9,6 +9,5 @@ echo "Writing offline token." --endpoint-url "${SECRETS_MANAGER_ENDPOINT_URL}" \ --secret-id "${OFFLINE_TOKEN_ARN}" | jq -r ".SecretString" > /tmp/offline-token.json -mkdir /etc/osbuild-worker jq -r ".offline_token" /tmp/offline-token.json > /etc/osbuild-worker/offline-token rm -f /tmp/offline-token.json diff --git a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_service.sh b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_service.sh index cc848d3a8..7ab6eab54 100755 --- a/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_service.sh +++ b/templates/packer/ansible/roles/common/files/worker-initialization-scripts/worker_service.sh @@ -4,8 +4,7 @@ source /tmp/cloud_init_vars echo "Setting up worker services." -sudo tee /etc/osbuild-worker/osbuild-worker.toml > /dev/null << EOF -base_path = "/api/image-builder-worker/v1" +sudo tee -a /etc/osbuild-worker/osbuild-worker.toml > /dev/null << EOF [authentication] oauth_url = "https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token" offline_token = "/etc/osbuild-worker/offline-token" diff --git a/templates/packer/ansible/roles/common/tasks/main.yml b/templates/packer/ansible/roles/common/tasks/main.yml index 8ceaafa99..de076f318 100644 --- a/templates/packer/ansible/roles/common/tasks/main.yml +++ b/templates/packer/ansible/roles/common/tasks/main.yml @@ -9,5 +9,8 @@ # Configure worker initialization service. - include_tasks: worker-initialization-service.yml +# Configure the worker. +- include_tasks: worker-config.yml + - name: Ensure SELinux contexts are updated command: restorecon -Rv /etc diff --git a/templates/packer/ansible/roles/common/tasks/worker-config.yml b/templates/packer/ansible/roles/common/tasks/worker-config.yml new file mode 100644 index 000000000..f8773c5fc --- /dev/null +++ b/templates/packer/ansible/roles/common/tasks/worker-config.yml @@ -0,0 +1,11 @@ +--- + +- name: Create osbuild-worker config directory + file: + path: /etc/osbuild-worker/ + state: directory + +- name: Copy worker config stub + copy: + src: "{{ playbook_dir }}/roles/common/files/osbuild-worker.toml" + dest: /etc/osbuild-worker/osbuild-worker.toml