openstack
/
openstack-ansible-os_keystone
Code Issues Proposed changes

Merge "Handle host with unset ansible_host"

This commit is contained in:
Zuul 2022-05-04 13:12:10 +00:00 committed by Gerrit Code Review
parent fcbf8ede8f 54a4e496b9
commit 05f0cd9027
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/keystone_credential_distribute.yml
View File

@ -21,7 +21,7 @@
-avz
--delete
{{ keystone_credential_key_repository }}/
{{ keystone_system_user_name }}@{{ hostvars[item]['ansible_host'] }}:{{ keystone_credential_key_repository }}/
{{ keystone_system_user_name }}@{{ hostvars[item]['ansible_host'] | default(item) }}:{{ keystone_credential_key_repository }}/
become: yes
become_user: "{{ keystone_system_user_name }}"
changed_when: false

2
tasks/keystone_fernet_keys_distribute.yml
View File

@ -21,7 +21,7 @@
-avz
--delete
{{ keystone_fernet_tokens_key_repository }}/
{{ keystone_system_user_name }}@{{ hostvars[item]['ansible_host'] }}:{{ keystone_fernet_tokens_key_repository }}/
{{ keystone_system_user_name }}@{{ hostvars[item]['ansible_host'] | default(item) }}:{{ keystone_fernet_tokens_key_repository }}/
become: yes
become_user: "{{ keystone_system_user_name }}"
changed_when: false

8
templates/keystone-credential-rotate.sh.j2
View File

@ -40,13 +40,17 @@ function autorotate {
{% for host in groups['keystone_all'] %}
{% if inventory_hostname != host %}
{% if 'ansible_host' in hostvars[host] %}
{% set destination_host = hostvars[host]['ansible_host'] %}
{% else %}
{% set destination_host = inventory_hostname %}
{% endif %}
# Fernet sync job to "{{ host }}"
rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
-avz \
--delete \
{{ keystone_credential_key_repository }}/ \
{{ keystone_system_user_name }}@{{ hostvars[host]['ansible_host'] }}:{{ keystone_credential_key_repository }}/
{{ keystone_system_user_name }}@{{ destination_host }}:{{ keystone_credential_key_repository }}/
{%- endif %}

9
templates/keystone-fernet-rotate.sh.j2
View File

@ -29,18 +29,23 @@ function autorotate {
{% for host in groups['keystone_all'] %}
{% if inventory_hostname != host %}
{% if 'ansible_host' in hostvars[host] %}
{% set destination_host = hostvars[host]['ansible_host'] %}
{% else %}
{% set destination_host = inventory_hostname %}
{% endif %}
# Fernet sync job to "{{ host }}"
scp -o UserKnownHostsFile=/dev/null \
-o StrictHostKeyChecking=no \
$(ls -dtr {{ keystone_fernet_tokens_key_repository }}/* | sort -Vr) \
{{ keystone_system_user_name }}@{{ hostvars[host]['ansible_host'] }}:{{ keystone_fernet_tokens_key_repository }}/
{{ keystone_system_user_name }}@{{ destination_host }}:{{ keystone_fernet_tokens_key_repository }}/
rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
-avz \
--delete \
{{ keystone_fernet_tokens_key_repository }}/ \
{{ keystone_system_user_name }}@{{ hostvars[host]['ansible_host'] }}:{{ keystone_fernet_tokens_key_repository }}/
{{ keystone_system_user_name }}@{{ destination_host }}:{{ keystone_fernet_tokens_key_repository }}/
{%- endif %}