From 5cd426fa897e41444448b17af551e0165abf00a5 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 24 Sep 2017 15:09:43 -0500 Subject: [PATCH] redhat debugging and remove dup'd stanzas --- roles/network/tasks/detected_network.yml | 19 +++++++++++++++++++ roles/network/tasks/main.yml | 10 +++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index f8e1e569a..6c422a746 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -30,6 +30,25 @@ include: detected_redhat.yml when: is_redhat +- name: check to see if dhcpcd is installed and active - Can Fail + shell: systemctl is-enabled dhcpcd + register: dhcpcd_test + ignore_errors: True + +- name: setting dhcpcd_test results + set_fact: + dhcpcd_result: "{{ dhcpcd_test.stdout }}" + +- name: check /etc/network/interfaces for gateway + shell: grep {{ device_gw }} /etc/network/interfaces | wc -l + when: is_debuntu + register: wan_file + +- name: setting wan_in_interfaces + set_fact: + wan_in_interfaces: True + when: is_debuntu and wan_file.stdout|int >= "0" + # WIRELESS -- if any wireless is detected as gateway, it becomes WAN - name: Look for any wireless interfaces shell: "cat /proc/net/wireless | grep -v -e Inter -e face | awk -F: '{print $1}' " diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index 4a1db623f..e0eba0efe 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -74,11 +74,11 @@ #### start network layout # setting installing would skip configuring network # but would configure but not start services -- include: computed_network.yml - when: not installing - tags: - - network - - network-discover +#- include: computed_network.yml +# when: not installing +# tags: +# - network +# - network-discover - include: computed_services.yml tags: