diff --git a/roles/router/tasks/install.yml b/roles/router/tasks/install.yml index 3490013..2b8b471 100644 --- a/roles/router/tasks/install.yml +++ b/roles/router/tasks/install.yml @@ -36,54 +36,6 @@ when: inventory_hostname in groups['oai_nodes'][0] become: true -- name: create {{ oai.docker.network.name }} network - community.docker.docker_network: - name: "{{ oai.docker.network.name }}" - driver: bridge - ipam_config: - - subnet: "{{ oai.docker.network.subnet }}" - state: present - driver_options: - com.docker.network.bridge.name: "{{ oai.docker.network.bridge.name }}" - when: inventory_hostname in groups['oai_nodes'][0] and oai.simulation == true - become: true - -- name: "add iptable rule: forward from {{ oai.docker.network.data_iface }} to {{ oai.docker.network.bridge.name }}" - iptables: - chain: FORWARD - in_interface: "{{ oai.docker.network.data_iface }}" - out_interface: "{{ oai.docker.network.bridge.name }}" - jump: ACCEPT - when: inventory_hostname in groups['oai_nodes'][0] and oai.simulation == true - become: true - -- name: "add iptable rule: forward from {{ oai.docker.network.bridge.name }} to {{ oai.docker.network.data_iface }}" - iptables: - chain: FORWARD - in_interface: "{{ oai.docker.network.bridge.name }}" - out_interface: "{{ oai.docker.network.data_iface }}" - jump: ACCEPT - when: inventory_hostname in groups['oai_nodes'][0] and oai.simulation == true - become: true - -- name: "add iptable rule: forward from {{ oai.docker.network.bridge.name }} to access" - iptables: - chain: FORWARD - in_interface: "{{ oai.docker.network.bridge.name }}" - out_interface: "access" - jump: ACCEPT - when: (inventory_hostname in groups['oai_nodes'][0]) and (inventory_hostname in groups['master_nodes']) and oai.simulation == true - become: true - -- name: "add iptable rule: forward from access to {{ oai.docker.network.bridge.name }}" - iptables: - chain: FORWARD - in_interface: "access" - out_interface: "{{ oai.docker.network.bridge.name }}" - jump: ACCEPT - when: (inventory_hostname in groups['oai_nodes'][0]) and (inventory_hostname in groups['master_nodes']) and oai.simulation == true - become: true - # TODO: use ansible's net_static_route module - name: configure static route for upf traffic on oai node shell: | diff --git a/roles/router/tasks/uninstall.yml b/roles/router/tasks/uninstall.yml index d2339a3..6b8867d 100644 --- a/roles/router/tasks/uninstall.yml +++ b/roles/router/tasks/uninstall.yml @@ -7,64 +7,6 @@ become: true ignore_errors: yes -- name: "remove a static route on core host for {{ oai.docker.network.subnet }} via {{ hostvars[item]['ansible_default_ipv4']['address'] }}" - shell: | - ip route del {{ oai.docker.network.subnet }} via {{ hostvars[item]['ansible_default_ipv4']['address'] }} - with_items: "{{ play_hosts | intersect(groups['oai_nodes'][0]) | difference(groups['master_nodes']) }}" - when: (inventory_hostname in groups['master_nodes']) and oai.simulation == true - become: true - ignore_errors: yes - -- name: "remove iptable rule: forward from access to {{ oai.docker.network.bridge.name }}" - iptables: - chain: FORWARD - in_interface: "access" - out_interface: "{{ oai.docker.network.bridge.name }}" - jump: ACCEPT - state: absent - when: (inventory_hostname in groups['oai_nodes'][0]) and (inventory_hostname in groups['master_nodes']) and oai.simulation == true - become: true - ignore_errors: yes - -- name: "remove iptable rule: forward from {{ oai.docker.network.bridge.name }} to access" - iptables: - chain: FORWARD - in_interface: "{{ oai.docker.network.bridge.name }}" - out_interface: "access" - jump: ACCEPT - state: absent - when: (inventory_hostname in groups['oai_nodes'][0]) and (inventory_hostname in groups['master_nodes']) and oai.simulation == true - become: true - ignore_errors: yes - -- name: "remove iptable rule: forward from {{ oai.docker.network.data_iface }} to {{ oai.docker.network.bridge.name }} " - iptables: - chain: FORWARD - in_interface: "{{ oai.docker.network.data_iface }}" - out_interface: "{{ oai.docker.network.bridge.name }}" - jump: ACCEPT - state: absent - when: inventory_hostname in groups['oai_nodes'][0] and oai.simulation == true - become: true - -- name: "delete iptable rule: forward from {{ oai.docker.network.bridge.name }} to {{ oai.docker.network.data_iface }}" - iptables: - chain: FORWARD - in_interface: "{{ oai.docker.network.bridge.name }}" - out_interface: "{{ oai.docker.network.data_iface }}" - jump: ACCEPT - state: absent - when: inventory_hostname in groups['oai_nodes'][0] and oai.simulation == true - become: true - -- name: delete {{ oai.docker.network.name }} network - community.docker.docker_network: - name: "{{ oai.docker.network.name }}" - state: absent - force: yes - when: inventory_hostname in groups['oai_nodes'][0] and oai.simulation == true - become: true - - name: set net.ipv4.conf.all.arp_filter to 0 ansible.posix.sysctl: name: net.ipv4.conf.all.arp_filter