From 749a333cc9be715a4b612c1c558122e8bd4df30b Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Wed, 27 Nov 2024 10:52:28 +0100 Subject: [PATCH 1/4] local --- ansible.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible.cfg b/ansible.cfg index fd15dc2..2f45534 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -8,7 +8,7 @@ executable = /bin/bash ; set inventory here, or on the command-line when running Ansible. ; dev is for Vagrant VirtualBox on Mac ; local is for localhost, assuming AlmaLinux or Rocky -inventory = inventory/dev/hosts +inventory = inventory/local/hosts ; Vagrant hosts are ephemeral set to true when promoting beyond test. host_key_checking = False From 7727857e74f4a958df4a1b979cefdb54fba89ec3 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Wed, 27 Nov 2024 11:36:20 +0100 Subject: [PATCH 2/4] Fix ansible-galaxy install in PreExec --- roles/semaphore/templates/semaphore.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/semaphore/templates/semaphore.service.j2 b/roles/semaphore/templates/semaphore.service.j2 index 8853403..4e9e6ee 100644 --- a/roles/semaphore/templates/semaphore.service.j2 +++ b/roles/semaphore/templates/semaphore.service.j2 @@ -24,7 +24,7 @@ SyslogIdentifier=semaphore ExecStartPre=/bin/bash -c 'pip3.12 install --upgrade --user -r /home/semaphore/requirements.txt' ExecStartPre=/bin/bash -c 'ansible-galaxy collection install --upgrade -r /home/semaphore/collections.yml' -ExecStartPre=/bin/bash -c 'ansible-galaxy install --upgrade -r /home/semaphore/requirements.yml' +ExecStartPre=/bin/bash -c 'ansible-galaxy install -r /home/semaphore/requirements.yml' [Install] WantedBy=multi-user.target From 0bba22da33b1a09c3949d95af1ee3b17421b7b7b Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Wed, 27 Nov 2024 11:43:48 +0100 Subject: [PATCH 3/4] Install collections --- roles/semaphore/tasks/present.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/semaphore/tasks/present.yml b/roles/semaphore/tasks/present.yml index dafab41..138d7ec 100644 --- a/roles/semaphore/tasks/present.yml +++ b/roles/semaphore/tasks/present.yml @@ -109,6 +109,7 @@ loop: - requirements.txt - requirements.yml + - collections.yml - name: Deploy Semaphore Config become: true From 48e7362014faef7c771e214606bb44949c9d6dc7 Mon Sep 17 00:00:00 2001 From: Bas Meijer Date: Wed, 27 Nov 2024 11:44:20 +0100 Subject: [PATCH 4/4] Only install github key when found --- roles/api/tasks/credentials.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/api/tasks/credentials.yml b/roles/api/tasks/credentials.yml index f2ba15f..c11217d 100644 --- a/roles/api/tasks/credentials.yml +++ b/roles/api/tasks/credentials.yml @@ -45,7 +45,7 @@ when: - "semaphore_keystores.json | selectattr('name', 'equalto', 'Controller-ssh-key') | length == 0" - - name: "Semaphore | Read ssh key from system" + - name: "Read ssh key from system" delegate_to: localhost connection: local become: false @@ -53,6 +53,7 @@ ansible.builtin.slurp: path: "{{ my_github_key }}" register: "ssh_key_github" + failed_when: false - name: "Create SSH key for GitHub" changed_when: "semaphore_key_github_created.status == 204" @@ -78,4 +79,5 @@ timeout: 5 register: semaphore_key_github_created when: + - "'file not found' not in ssh_key_github.msg" - "semaphore_keystores.json | selectattr('name', 'equalto', 'github-ssh-key') | length == 0"