openstack/openstack-ansible
Code Issues Proposed changes

Disable fact variables

Browse Source 
This patch disables automatic generation of ansible_<var>
variables which are duplicate of ansible_facts['var'].

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/860424
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_neutron/+/860480
Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/866119
Change-Id: I7f39aa2c628761d5f56eea7eb8d05e715efd00e9
This commit is contained in:
Jonathan Rosser 2021-03-03 09:46:43 +00:00 committed by Dmitriy Rabotyagov
parent dc1f76c823
commit 9ca06ea5e6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/group_vars/all/nova.yml
View File

@ -33,6 +33,6 @@ nova_consoles:
port: 0 port: 0
path: "" path: ""
nova_console_type: "{{ (ansible_architecture == 'aarch64') | ternary('serialconsole', 'novnc') }}" nova_console_type: "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('serialconsole', 'novnc') }}"
nova_console_port: "{{ nova_consoles[nova_console_type]['port'] }}" nova_console_port: "{{ nova_consoles[nova_console_type]['port'] }}"
nova_console_path: "{{ nova_consoles[nova_console_type]['path'] }}" nova_console_path: "{{ nova_consoles[nova_console_type]['path'] }}"

4
inventory/group_vars/repo_all.yml
View File

@ -26,10 +26,10 @@ repo_container_bind_mounts:
# Enable glusterfs mount # Enable glusterfs mount
repo_server_systemd_mounts: repo_server_systemd_mounts:
- what: "{{ ansible_hostname }}:gfs-repo" - what: "{{ ansible_facts['hostname'] }}:gfs-repo"
where: "/var/www/repo" where: "/var/www/repo"
type: glusterfs type: glusterfs
state: 'started' state: 'started'
enabled: true enabled: true
openstack_repo_server_enable_glusterfs: True openstack_repo_server_enable_glusterfs: True

1
scripts/openstack-ansible.rc
View File

@ -37,6 +37,7 @@ export ANSIBLE_GATHER_SUBSET="${ANSIBLE_GATHER_SUBSET:-!all,min}"
export ANSIBLE_CACHE_PLUGIN="${ANSIBLE_CACHE_PLUGIN:-jsonfile}" export ANSIBLE_CACHE_PLUGIN="${ANSIBLE_CACHE_PLUGIN:-jsonfile}"
export ANSIBLE_CACHE_PLUGIN_CONNECTION="${ANSIBLE_CACHE_PLUGIN_CONNECTION:-${OSA_CONFIG_DIR}/ansible_facts}" export ANSIBLE_CACHE_PLUGIN_CONNECTION="${ANSIBLE_CACHE_PLUGIN_CONNECTION:-${OSA_CONFIG_DIR}/ansible_facts}"
export ANSIBLE_CACHE_PLUGIN_TIMEOUT="${ANSIBLE_CACHE_PLUGIN_TIMEOUT:-86400}" export ANSIBLE_CACHE_PLUGIN_TIMEOUT="${ANSIBLE_CACHE_PLUGIN_TIMEOUT:-86400}"
export ANSIBLE_INJECT_FACT_VARS="${ANSIBLE_INJECT_FACT_VARS:-False}"
if [[ "${ANSIBLE_CACHE_PLUGIN}" == "memcached" ]];then if [[ "${ANSIBLE_CACHE_PLUGIN}" == "memcached" ]];then
if ! echo stats | nc -w 1 $(echo ${ANSIBLE_CACHE_PLUGIN_CONNECTION}|awk -F',' '{print $1}'|sed 's/:/ /') > /dev/null; then if ! echo stats | nc -w 1 $(echo ${ANSIBLE_CACHE_PLUGIN_CONNECTION}|awk -F',' '{print $1}'|sed 's/:/ /') > /dev/null; then