openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Address ansible_ssh_* var deprecation

Browse Source 
Replacing usage of ansible_ssh_host, ansible_ssh_user,
ansible_ssh_port with ansible_host, ansible_user and ansible_port

Change-Id: I4adb6484c13523a2527adc62846b736b0c5f228e
This commit is contained in:
Travis Truman 2016-09-17 17:50:47 -04:00
parent 01e1299110
commit a74af47939
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/keystone_credential_distribute.yml
View File

@ -19,7 +19,7 @@
-avz \ -avz \
--delete \ --delete \
{{ keystone_credential_key_repository }}/ \ {{ keystone_credential_key_repository }}/ \
{{ keystone_system_user_name }}@{{ hostvars[item]['ansible_ssh_host'] }}:{{ keystone_credential_key_repository }}/ {{ keystone_system_user_name }}@{{ hostvars[item]['ansible_host'] }}:{{ keystone_credential_key_repository }}/
become: yes become: yes
become_user: "{{ keystone_system_user_name }}" become_user: "{{ keystone_system_user_name }}"
with_items: "{{ groups['keystone_all'][1:] }}" with_items: "{{ groups['keystone_all'][1:] }}"

2
tasks/keystone_fernet_keys_distribute.yml
View File

@ -19,7 +19,7 @@
-avz \ -avz \
--delete \ --delete \
{{ keystone_fernet_tokens_key_repository }}/ \ {{ keystone_fernet_tokens_key_repository }}/ \
{{ keystone_system_user_name }}@{{ hostvars[item]['ansible_ssh_host'] }}:{{ keystone_fernet_tokens_key_repository }}/ {{ keystone_system_user_name }}@{{ hostvars[item]['ansible_host'] }}:{{ keystone_fernet_tokens_key_repository }}/
become: yes become: yes
become_user: "{{ keystone_system_user_name }}" become_user: "{{ keystone_system_user_name }}"
with_items: "{{ groups['keystone_all'][1:] }}" with_items: "{{ groups['keystone_all'][1:] }}"

4
tasks/keystone_service_setup.yml
View File

@ -15,14 +15,14 @@
- name: Wait for keystone admin to come up - name: Wait for keystone admin to come up
wait_for: wait_for:
host: "{{ ansible_ssh_host }}" host: "{{ ansible_host }}"
port: "{{ keystone_admin_port }}" port: "{{ keystone_admin_port }}"
timeout: 25 timeout: 25
delay: 10 delay: 10
- name: Wait for keystone service to come up - name: Wait for keystone service to come up
wait_for: wait_for:
host: "{{ ansible_ssh_host }}" host: "{{ ansible_host }}"
port: "{{ keystone_service_port }}" port: "{{ keystone_service_port }}"
timeout: 25 timeout: 25
delay: 10 delay: 10

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

@ -46,7 +46,7 @@ function autorotate {
-avz \ -avz \
--delete \ --delete \
{{ keystone_credential_key_repository }}/ \ {{ keystone_credential_key_repository }}/ \
{{ keystone_system_user_name }}@{{ hostvars[host]['ansible_ssh_host'] }}:{{ keystone_credential_key_repository }}/ {{ keystone_system_user_name }}@{{ hostvars[host]['ansible_host'] }}:{{ keystone_credential_key_repository }}/
{%- endif %} {%- endif %}

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

@ -35,7 +35,7 @@ function autorotate {
-avz \ -avz \
--delete \ --delete \
{{ keystone_fernet_tokens_key_repository }}/ \ {{ keystone_fernet_tokens_key_repository }}/ \
{{ keystone_system_user_name }}@{{ hostvars[host]['ansible_ssh_host'] }}:{{ keystone_fernet_tokens_key_repository }}/ {{ keystone_system_user_name }}@{{ hostvars[host]['ansible_host'] }}:{{ keystone_fernet_tokens_key_repository }}/
{%- endif %} {%- endif %}

6
tests/inventory
View File

@ -1,8 +1,8 @@
[all] [all]
localhost ansible_become=True localhost ansible_become=True
infra1 ansible_ssh_host=10.1.0.2 ansible_host=10.1.0.2 ansible_become=True ansible_user=root infra1 ansible_host=10.1.0.2 ansible_become=True ansible_user=root
keystone1 ansible_ssh_host=10.1.0.3 ansible_host=10.1.0.3 ansible_become=True ansible_user=root keystone1 ansible_host=10.1.0.3 ansible_become=True ansible_user=root
keystone2 ansible_ssh_host=10.1.0.4 ansible_host=10.1.0.4 ansible_become=True ansible_user=root keystone2 ansible_host=10.1.0.4 ansible_become=True ansible_user=root
[all_containers] [all_containers]
infra1 infra1