Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

delegations: use quotes when using a variable in a delegate_to

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-06-03 12:58:59 -07:00
parent 2f81e76657
commit 35930379f8
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/groups/oci-registry.yml
View file

@ -85,7 +85,7 @@
candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}", candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}",
candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}", candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}",
when: env == "staging", when: env == "staging",
delegate_to: compose-x86-01.{{ datacenter }}.fedoraproject.org delegate_to: "compose-x86-01.{{ datacenter }}.fedoraproject.org"
} }
- { - {
role: login-registry, role: login-registry,
@ -93,5 +93,5 @@
candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}", candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}",
candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}", candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}",
when: env == "production", when: env == "production",
delegate_to: compose-x86-01.{{ datacenter }}.fedoraproject.org delegate_to: "compose-x86-01.{{ datacenter }}.fedoraproject.org"
} }

10
roles/letsencrypt/tasks/main.yml
View file

@ -1,5 +1,5 @@
- name: Generate (or renew) the certificate - name: Generate (or renew) the certificate
delegate_to: certgetter01.{{ datacenter }}.fedoraproject.org delegate_to: "certgetter01.{{ datacenter }}.fedoraproject.org"
command: certbot certonly --expand --keep -n --webroot --webroot-path /var/www/html/ -d {{','.join([site_name] + server_aliases)}} command: certbot certonly --expand --keep -n --webroot --webroot-path /var/www/html/ -d {{','.join([site_name] + server_aliases)}}
run_once: true run_once: true
register: certbot_output register: certbot_output
@ -10,7 +10,7 @@
# Find the directory to use # Find the directory to use
- name: Get the directory to use - name: Get the directory to use
delegate_to: certgetter01.{{ datacenter }}.fedoraproject.org delegate_to: "certgetter01.{{ datacenter }}.fedoraproject.org"
# Sometimes we get directories like site-0001, site-0002, etc. We want the latest # Sometimes we get directories like site-0001, site-0002, etc. We want the latest
shell: "file /etc/letsencrypt/live/{{site_name}}* | tail -1 | sed -e 's/: directory//' | tr -d '\n'" shell: "file /etc/letsencrypt/live/{{site_name}}* | tail -1 | sed -e 's/: directory//' | tr -d '\n'"
register: certbot_dir register: certbot_dir
@ -21,7 +21,7 @@
# And once we do that, we need to copy some things. # And once we do that, we need to copy some things.
- name: Obtain the certificate - name: Obtain the certificate
delegate_to: certgetter01.{{ datacenter }}.fedoraproject.org delegate_to: "certgetter01.{{ datacenter }}.fedoraproject.org"
command: "cat {{certbot_dir.stdout}}/cert.pem" command: "cat {{certbot_dir.stdout}}/cert.pem"
register: certbot_certificate register: certbot_certificate
changed_when: 'false' changed_when: 'false'
@ -30,7 +30,7 @@
- letsencrypt - letsencrypt
- name: Obtain the intermediate certificate - name: Obtain the intermediate certificate
delegate_to: certgetter01.{{ datacenter }}.fedoraproject.org delegate_to: "certgetter01.{{ datacenter }}.fedoraproject.org"
command: cat {{certbot_dir.stdout}}/chain.pem command: cat {{certbot_dir.stdout}}/chain.pem
register: certbot_chain register: certbot_chain
changed_when: 'false' changed_when: 'false'
@ -39,7 +39,7 @@
- letsencrypt - letsencrypt
- name: Obtain the key - name: Obtain the key
delegate_to: certgetter01.{{ datacenter }}.fedoraproject.org delegate_to: "certgetter01.{{ datacenter }}.fedoraproject.org"
command: cat {{certbot_dir.stdout}}/privkey.pem command: cat {{certbot_dir.stdout}}/privkey.pem
register: certbot_key register: certbot_key
changed_when: 'false' changed_when: 'false'