openstack/openstack-ansible-galera_server
Code Issues Proposed changes

Set default for physical_host if it's undefined

Browse Source 
physical_host is a host variable created by openstack-ansible's dynamic
inventory. When using this role outside of an integrated OSA deployment
it wouldn't be expected to be set. Fallback on using inventory_hostname
when physical_host is undefined.

Closes-Bug: 1631158
Change-Id: I3364aac2e707d10ac9b4020dfcc0de7d4d158ff9
This commit is contained in:
Jimmy McCrory 2016-10-08 09:48:40 -07:00
parent aa2354d476
commit 1b0d2d3aa2
3 changed files with 12 additions and 12 deletions

8
vars/redhat-7.yml

@ -59,8 +59,8 @@ galera_server_percona_distro_packages:
# Validate SSL certificates when downloading the galera packages above
# May be set to "no" when proxy server is intercepting the certificates.
percona_package_download_validate_certs: "yes"
percona_package_url: "{{ percona_arch_url.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
percona_package_sha256: "{{ percona_arch_sha256.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
percona_package_url: "{{ percona_arch_url.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
percona_package_sha256: "{{ percona_arch_sha256.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
percona_package_path: "/opt/{{ percona_package_url | basename }}"
percona_arch_url:
@ -69,8 +69,8 @@ percona_arch_sha256:
x86_64: "030585abb52b24a781641374fe7c4530518b176a10ed4eb75547803b6b1f60e4"
qpress_package_download_validate_certs: yes
qpress_package_url: "{{ qpress_arch_url.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
qpress_package_sha256: "{{ qpress_arch_sha256.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
qpress_package_url: "{{ qpress_arch_url.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
qpress_package_sha256: "{{ qpress_arch_sha256.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
qpress_package_path: "/opt/{{ qpress_package_url | basename }}"
qpress_arch_url:

8
vars/ubuntu-14.04.yml

@ -74,8 +74,8 @@ galera_server_percona_distro_packages:
# Validate SSL certificates when downloading the galera deb above
# May be set to "no" when proxy server is intercepting the certificates.
percona_package_download_validate_certs: "yes"
percona_package_url: "{{ percona_arch_url.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
percona_package_sha256: "{{ percona_arch_sha256.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
percona_package_url: "{{ percona_arch_url.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
percona_package_sha256: "{{ percona_arch_sha256.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
percona_package_path: "/opt/{{ percona_package_url | basename }}"
percona_arch_url:
@ -84,8 +84,8 @@ percona_arch_sha256:
x86_64: "2f58eedefa905583f0650f77bb2b149139c4066c7fb690202124fe5c7ac83e9e"
qpress_package_download_validate_certs: yes
qpress_package_url: "{{ qpress_arch_url.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
qpress_package_sha256: "{{ qpress_arch_sha256.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
qpress_package_url: "{{ qpress_arch_url.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
qpress_package_sha256: "{{ qpress_arch_sha256.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
qpress_package_path: "/opt/{{ qpress_package_url | basename }}"
qpress_arch_url:

8
vars/ubuntu-16.04.yml

@ -74,8 +74,8 @@ galera_server_percona_distro_packages:
# Validate SSL certificates when downloading the galera deb above
# May be set to "no" when proxy server is intercepting the certificates.
percona_package_download_validate_certs: yes
percona_package_url: "{{ percona_arch_url.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
percona_package_sha256: "{{ percona_arch_sha256.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
percona_package_url: "{{ percona_arch_url.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
percona_package_sha256: "{{ percona_arch_sha256.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
percona_package_path: "/opt/{{ percona_package_url | basename }}"
percona_arch_url:
@ -86,8 +86,8 @@ percona_arch_sha256:
ppc64le: "902969b427a36743f5af1e399ff19b3904c3803d760700f959c8cc9102ab802c"
qpress_package_download_validate_certs: yes
qpress_package_url: "{{ qpress_arch_url.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
qpress_package_sha256: "{{ qpress_arch_sha256.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
qpress_package_url: "{{ qpress_arch_url.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
qpress_package_sha256: "{{ qpress_arch_sha256.get( hostvars[physical_host | default(inventory_hostname)]['ansible_architecture'] | lower ) }}"
qpress_package_path: "/opt/{{ qpress_package_url | basename }}"
qpress_arch_url: