From 1b0d2d3aa22564e21b7933d8ff21852c8f251ab4 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Sat, 8 Oct 2016 09:48:40 -0700 Subject: [PATCH] Set default for physical_host if it's undefined 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 --- vars/redhat-7.yml | 8 ++++---- vars/ubuntu-14.04.yml | 8 ++++---- vars/ubuntu-16.04.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index f661fa37..2f41bb0a 100644 --- a/vars/redhat-7.yml +++ b/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: diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index 00ece59a..4ec1c498 100644 --- a/vars/ubuntu-14.04.yml +++ b/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: diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index bf355dd3..a1382924 100644 --- a/vars/ubuntu-16.04.yml +++ b/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: