openstack/openstack-ansible-galera_server
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: I35371879a87c115f219cd181245fe59f6d7d3f77
This commit is contained in:
Travis Truman 2016-09-17 17:44:24 -04:00
parent 21aaa7cc4f
commit 6c1422cc57
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -66,8 +66,8 @@ galera_innodb_log_file_size: 1024M
galera_innodb_log_buffer_size: 128M
## wsrep configuration
galera_wsrep_address: "{{ ansible_ssh_host }}"
galera_wsrep_cluster_address: "{% for host in galera_cluster_members %}{{ hostvars[host]['ansible_ssh_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
galera_wsrep_address: "{{ ansible_host }}"
galera_wsrep_cluster_address: "{% for host in galera_cluster_members %}{{ hostvars[host]['ansible_host'] }}{% if not loop.last %},{% endif %}{% endfor %}"
galera_wsrep_node_incoming_address: "{{ galera_wsrep_address }}"
galera_wsrep_slave_threads: "{{ (ansible_processor_vcpus | int > 0) | ternary (ansible_processor_vcpus, 2) }}"
galera_wsrep_retry_autocommit: 3

6
tests/inventory
View File

@ -1,8 +1,8 @@
[all]
localhost ansible_become=True
container1 ansible_ssh_host=10.100.100.101 ansible_host=10.100.100.101 ansible_become=True ansible_user=root
container2 ansible_ssh_host=10.100.100.102 ansible_host=10.100.100.102 ansible_become=True ansible_user=root
container3 ansible_ssh_host=10.100.100.103 ansible_host=10.100.100.103 ansible_become=True ansible_user=root
container1 ansible_host=10.100.100.101 ansible_become=True ansible_user=root
container2 ansible_host=10.100.100.102 ansible_become=True ansible_user=root
container3 ansible_host=10.100.100.103 ansible_become=True ansible_user=root
[galera_all]
container1

6
tests/test-galera-server-functional.yml
View File

@ -20,7 +20,7 @@
tasks:
- name: Check cluster incoming addresses
command: |
mysql -h {{ ansible_ssh_host }} \
mysql -h {{ ansible_host }} \
-p"{{ galera_root_password }}" \
-e "show status like 'wsrep_incoming_addresses';" \
--silent \
@ -28,7 +28,7 @@
register: wsrep_incoming_addresses
- name: Check cluster local state
command: |
mysql -h {{ ansible_ssh_host }} \
mysql -h {{ ansible_host }} \
-p"{{ galera_root_password }}" \
-e "show status like 'wsrep_local_state_comment';" \
--silent \
@ -36,7 +36,7 @@
register: wsrep_local_state_comment
- name: Check cluster evs state
command: |
mysql -h {{ ansible_ssh_host }} \
mysql -h {{ ansible_host }} \
-p"{{ galera_root_password }}" \
-e "show status like 'wsrep_evs_state';" \
--silent \