Merge "Disable fact variables"
This commit is contained in:
commit
34761f07e8
@ -33,6 +33,6 @@ nova_consoles:
|
||||
port: 0
|
||||
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_path: "{{ nova_consoles[nova_console_type]['path'] }}"
|
||||
|
@ -26,10 +26,10 @@ repo_container_bind_mounts:
|
||||
|
||||
# Enable glusterfs mount
|
||||
repo_server_systemd_mounts:
|
||||
- what: "{{ ansible_hostname }}:gfs-repo"
|
||||
- what: "{{ ansible_facts['hostname'] }}:gfs-repo"
|
||||
where: "/var/www/repo"
|
||||
type: glusterfs
|
||||
state: 'started'
|
||||
enabled: true
|
||||
|
||||
openstack_repo_server_enable_glusterfs: True
|
||||
openstack_repo_server_enable_glusterfs: True
|
||||
|
@ -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_CONNECTION="${ANSIBLE_CACHE_PLUGIN_CONNECTION:-${OSA_CONFIG_DIR}/ansible_facts}"
|
||||
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 ! echo stats | nc -w 1 $(echo ${ANSIBLE_CACHE_PLUGIN_CONNECTION}|awk -F',' '{print $1}'|sed 's/:/ /') > /dev/null; then
|
||||
|
Loading…
Reference in New Issue
Block a user