diff --git a/tasks/FreeBSD.yml b/tasks/FreeBSD.yml index a960219b63bc84271f11988f7169954be407c7f4..df89d60b1bf59a583d0eb83b6652d1500da09a47 100644 --- a/tasks/FreeBSD.yml +++ b/tasks/FreeBSD.yml @@ -10,14 +10,6 @@ loop: '{{ kypo_interface_interfaces }}' when: kypo_interface_clean is defined and kypo_interface_clean -- name: configure interfaces - include_tasks: interface-FreeBSD.yml - vars: - kypo_interface_device: '{{ kypo_interface_item.kypo_interface_device }}' - loop_control: - loop_var: kypo_interface_item - loop: '{{ kypo_interface_interfaces }}' - - name: get default gateway set_fact: kypo_interface_default_gateway: '{{ kypo_interface_interfaces | selectattr("kypo_interface_default_gateway", "defined") | first }}' @@ -68,7 +60,7 @@ delegate_to: localhost - set_fact: - interfaces: "{{ ansible_interfaces | select('match', '^(vtnet)[2-9]+') | list }}" + interfaces: "{{ ansible_interfaces | select('match', '^(vtnet)[0-9]+') | list }}" - set_fact: interface_configs: |- @@ -78,7 +70,7 @@ {%- endfor -%} ] -- name: set static addressing on user defined networks +- name: set static addressing on allnetworks xml: path: '{{ kypo_interface_opnsense_local_config_file }}' xpath: '/opnsense/interfaces/{{ item.0.if }}/{{ item.1.key }}' diff --git a/tasks/interface-FreeBSD.yml b/tasks/interface-FreeBSD.yml deleted file mode 100644 index c6c2d45ffe63cfa4cf768afd9a4ee0a7a271b2b2..0000000000000000000000000000000000000000 --- a/tasks/interface-FreeBSD.yml +++ /dev/null @@ -1,16 +0,0 @@ -- name: prepare interface configuration - set_fact: - kypo_interface_config: - if: '{{ kypo_interface_device }}' - ipaddr: dhcp - mtu: '{{ kypo_interface_mtu }}' - enable: 1 - -- name: configure interface - xml: - path: '{{ kypo_interface_opnsense_local_config_file }}' - xpath: '/opnsense/interfaces/{{ kypo_interface_device }}/{{ item.key }}' - value: '{{ item.value }}' - pretty_print: yes - delegate_to: localhost - loop: '{{ kypo_interface_config | dict2items }}'