1549
This commit is contained in:
@@ -2654,36 +2654,46 @@
|
|||||||
shell: |
|
shell: |
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
# Choose connection method (tunnel > LLDP IPv4 > LLDP IPv6)
|
# Try every DEV2 shell path that is available.
|
||||||
|
# Stop only after a path actually returns true/false.
|
||||||
if [ "{{ dev2_passfile_used | default('NONE') }}" != "NONE" ]; then
|
if [ "{{ dev2_passfile_used | default('NONE') }}" != "NONE" ]; then
|
||||||
PORT="{{ _local_port }}"
|
PORT="{{ _local_port }}"
|
||||||
sshpass -f "{{ dev2_passfile_used }}" ssh {{ ssh_opts_common }} \
|
OUT="$(sshpass -f "{{ dev2_passfile_used }}" ssh {{ ssh_opts_common }} \
|
||||||
-o ConnectTimeout={{ ssh_timeout }} \
|
-o ConnectTimeout={{ ssh_timeout }} \
|
||||||
-p "$PORT" "{{ dev2_ssh_user }}@127.0.0.1" \
|
-p "$PORT" "{{ dev2_ssh_user }}@127.0.0.1" \
|
||||||
"cat /tmp/config.json 2>/dev/null | grep -i block -A2 | grep enab | head -n1"
|
"cat /tmp/config.json 2>/dev/null | grep -i block -A2 | grep enab | head -n1" 2>/dev/null || true)"
|
||||||
exit 0
|
case "$(printf '%s' "$OUT" | tr '[:upper:]' '[:lower:]')" in
|
||||||
|
*true*) echo true; exit 0 ;;
|
||||||
|
*false*) echo false; exit 0 ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "{{ dev2_passfile_used_lldp | default('NONE') }}" != "NONE" ] && [ -n "{{ lldp_dev2_ip | default('') }}" ]; then
|
if [ "{{ dev2_passfile_used_lldp | default('NONE') }}" != "NONE" ] && [ -n "{{ lldp_dev2_ip | default('') }}" ]; then
|
||||||
sshpass -f "{{ dev2_passfile_used_lldp }}" ssh \
|
OUT="$(sshpass -f "{{ dev2_passfile_used_lldp }}" ssh \
|
||||||
-o StrictHostKeyChecking=no -o PubkeyAuthentication=no \
|
-o StrictHostKeyChecking=no -o PubkeyAuthentication=no \
|
||||||
-o ConnectTimeout=15 \
|
-o ConnectTimeout=15 \
|
||||||
"{{ dev2_ssh_user }}@{{ lldp_dev2_ip }}" \
|
"{{ dev2_ssh_user }}@{{ lldp_dev2_ip }}" \
|
||||||
"cat /tmp/config.json 2>/dev/null | grep -i block -A2 | grep enab | head -n1"
|
"cat /tmp/config.json 2>/dev/null | grep -i block -A2 | grep enab | head -n1" 2>/dev/null || true)"
|
||||||
exit 0
|
case "$(printf '%s' "$OUT" | tr '[:upper:]' '[:lower:]')" in
|
||||||
|
*true*) echo true; exit 0 ;;
|
||||||
|
*false*) echo false; exit 0 ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "{{ dev2_passfile_used_lldp6 | default('NONE') }}" != "NONE" ] && [ -n "{{ lldp_dev2_ip6 | default('') }}" ]; then
|
if [ "{{ dev2_passfile_used_lldp6 | default('NONE') }}" != "NONE" ] && [ -n "{{ lldp_dev2_ip6 | default('') }}" ]; then
|
||||||
IP6="{{ lldp_dev2_ip6 }}"
|
IP6="{{ lldp_dev2_ip6 }}"
|
||||||
F="{{ dev2_passfile_used_lldp6 }}"
|
F="{{ dev2_passfile_used_lldp6 }}"
|
||||||
sshpass -p '{{ dev1_pass }}' ssh {{ ssh_opts_common }} \
|
OUT="$(sshpass -p '{{ dev1_pass }}' ssh {{ ssh_opts_common }} \
|
||||||
"{{ dev1_user }}@{{ ansible_host|default(inventory_hostname) }}" \
|
"{{ dev1_user }}@{{ ansible_host|default(inventory_hostname) }}" \
|
||||||
"sshpass -f '/tmp/${F}' ssh \
|
"sshpass -f '/tmp/${F}' ssh \
|
||||||
-o StrictHostKeyChecking=no -o PubkeyAuthentication=no \
|
-o StrictHostKeyChecking=no -o PubkeyAuthentication=no \
|
||||||
-o ConnectTimeout={{ ssh_timeout }} \
|
-o ConnectTimeout={{ ssh_timeout }} \
|
||||||
'{{ dev2_ssh_user }}@\[${IP6}%{{ dev1_iface }}\]' \
|
'{{ dev2_ssh_user }}@\[${IP6}%{{ dev1_iface }}\]' \
|
||||||
\"cat /tmp/config.json 2>/dev/null | grep -i block -A2 | grep enab | head -n1\""
|
\"cat /tmp/config.json 2>/dev/null | grep -i block -A2 | grep enab | head -n1\"" 2>/dev/null || true)"
|
||||||
exit 0
|
case "$(printf '%s' "$OUT" | tr '[:upper:]' '[:lower:]')" in
|
||||||
|
*true*) echo true; exit 0 ;;
|
||||||
|
*false*) echo false; exit 0 ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
@@ -2697,16 +2707,7 @@
|
|||||||
- name: Dev2 | Normalize payredirect value
|
- name: Dev2 | Normalize payredirect value
|
||||||
delegate_to: localhost
|
delegate_to: localhost
|
||||||
vars:
|
vars:
|
||||||
payredirect_raw_clean: >-
|
payredirect_raw_clean: "{{ dev2_payredirect_raw.stdout | default('') | trim | lower }}"
|
||||||
{{
|
|
||||||
'true'
|
|
||||||
if 'true' in (dev2_payredirect_raw.stdout | default('') | lower)
|
|
||||||
else (
|
|
||||||
'false'
|
|
||||||
if 'false' in (dev2_payredirect_raw.stdout | default('') | lower)
|
|
||||||
else ''
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
set_fact:
|
set_fact:
|
||||||
payredirect_value: >-
|
payredirect_value: >-
|
||||||
{{
|
{{
|
||||||
|
|||||||
Reference in New Issue
Block a user