Skip to content

Commit 723cd30

Browse files
committed
ansible/playbook 1: corrected Docker and Terraform GPG keys
1 parent 8e0596a commit 723cd30

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

automation/vm-ansible-setup/playbooks/setup_vm_part1.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@
106106
state: directory
107107
mode: '0755'
108108

109-
- name: Add Docker GPG key
109+
- name: Download Docker GPG key
110110
ansible.builtin.get_url:
111111
url: "https://download.docker.com/linux/ubuntu/gpg"
112-
dest: "/etc/apt/keyrings/docker.gpg"
112+
dest: "/etc/apt/keyrings/docker.asc"
113113
mode: '0644'
114114

115115
- name: Add Docker APT repository
116116
ansible.builtin.apt_repository:
117117
repo: >
118-
deb [arch={{ architecture }} signed-by=/etc/apt/keyrings/docker.gpg]
118+
deb [arch={{ architecture }} signed-by=/etc/apt/keyrings/docker.asc]
119119
https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
120120
state: present
121121

@@ -178,6 +178,8 @@
178178
ansible.builtin.shell: |
179179
set -o pipefail
180180
gcloud services list --enabled --format="value(config.name)" | grep -q "^artifactregistry.googleapis.com$"
181+
args:
182+
executable: /bin/bash
181183
become_user: "{{ my_user }}"
182184
become: true
183185
register: gcp_ar_check
@@ -187,6 +189,8 @@
187189
- name: Enable GCP Artifact Registry API
188190
ansible.builtin.shell: |
189191
gcloud services enable artifactregistry.googleapis.com
192+
args:
193+
executable: /bin/bash
190194
become_user: "{{ my_user }}"
191195
become: true
192196
when: gcp_ar_check.rc != 0
@@ -232,11 +236,15 @@
232236
tags: terraform
233237
when: not terraform_check.stat.exists
234238
block:
235-
- name: Add HashiCorp GPG key
236-
ansible.builtin.get_url:
237-
url: "https://apt.releases.hashicorp.com/gpg"
238-
dest: "/usr/share/keyrings/hashicorp-archive-keyring.gpg"
239-
mode: '0644'
239+
- name: Download and dearmor HashiCorp GPG key # noqa command-instead-of-module
240+
ansible.builtin.shell: |
241+
set -o pipefail
242+
curl -fsSL https://apt.releases.hashicorp.com/gpg | \
243+
gpg --dearmor | \
244+
tee /usr/share/keyrings/hashicorp-archive-keyring.gpg > /dev/null
245+
args:
246+
creates: /usr/share/keyrings/hashicorp-archive-keyring.gpg
247+
executable: /bin/bash
240248

241249
- name: Add HashiCorp APT repository
242250
ansible.builtin.apt_repository:

0 commit comments

Comments
 (0)