summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/host_vars/ele-router.yml62
1 files changed, 42 insertions, 20 deletions
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index 2e226ed9..753d16b4 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -9,31 +9,39 @@ network_internal_zone_names:
openwrt_network_external:
+ - name: switch_vlan
+ options:
+ device: 'switch0'
+ vlan: '{{ network_wan_zone.vlan }}'
+ ports: '1 2 3 4 6t'
+
- name: interface 'wan'
options:
- ifname: eth0
+ ifname: 'eth0.{{ network_wan_zone.vlan }}'
proto: dhcp
-
- # - name: interface 'wan'
- # options:
- # ifname: "eth0.{{ network_wan_zone.vlan }}"
- # accept_ra: 0
# proto: static
# ipaddr: "{{ network_wan_zone.prefix | ipaddr(network_wan_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
# netmask: "{{ network_wan_zone.prefix | ipaddr('netmask') }}"
# gateway: "{{ network_wan_zone.gw }}"
# dns: "{{ network_wan_zone.dns }}"
+ # accept_ra: 0
openwrt_network_internal: "{{ openwrt_network_internal_yaml | from_yaml }}"
openwrt_network_internal_yaml: |
{% for zone_name in network_internal_zone_names %}
+ - name: switch_vlan
+ options:
+ device: 'switch0'
+ vlan: '{{ network_zones[zone_name].vlan }}'
+ ports: '0t 6t'
+
- name: "interface '{{ zone_name }}'"
options:
- ifname: "eth1.{{ network_zones[zone_name].vlan }}"
- accept_ra: 0
+ ifname: "eth0.{{ network_zones[zone_name].vlan }}"
proto: static
ipaddr: "{{ network_zones[zone_name].gw }}"
netmask: "{{ network_zones[zone_name].prefix | ipaddr('netmask') }}"
+ accept_ra: 0
{% endfor %}
openwrt_network_base:
@@ -48,13 +56,25 @@ openwrt_network_base:
ipaddr: 127.0.0.1
netmask: 255.0.0.0
+ - name: switch
+ options:
+ name: 'switch0'
+ reset: '1'
+ enable_vlan: '1'
+
+ - name: switch_vlan
+ options:
+ device: 'switch0'
+ vlan: '{{ network_mgmt_zone.vlan }}'
+ ports: '0t 6t'
+
- name: interface 'mgmt'
options:
- ifname: "eth1.{{ network_mgmt_zone.vlan }}"
- accept_ra: 0
+ ifname: "eth0.{{ network_mgmt_zone.vlan }}"
proto: static
ipaddr: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
netmask: "{{ network_mgmt_zone.prefix | ipaddr('netmask') }}"
+ accept_ra: 0
openwrt_dhcp_external:
@@ -112,18 +132,15 @@ openwrt_dhcp_base:
-openwrt_variant: lede
-openwrt_release: 17.01.6
-openwrt_arch: ar71xx
-openwrt_target: generic
-openwrt_profile: tl-wr710n-v2
+openwrt_variant: openwrt
+openwrt_release: 18.06.1
+openwrt_arch: ramips
+openwrt_target: mt7621
+openwrt_profile: ubnt-erx
openwrt_output_image_suffixes:
- - "generic-{{ openwrt_profile }}-squashfs-sysupgrade.bin"
+ - "{{ openwrt_profile }}-squashfs-sysupgrade.tar"
openwrt_packages_remove:
- - kmod-gpio-button-hotplug
- - kmod-ath9k
- - wpad-mini
- ppp
- ppp-mod-pppoe
- firewall
@@ -231,6 +248,12 @@ openwrt_uci:
- '2.lede.pool.ntp.org'
- '3.lede.pool.ntp.org'
+ - name: gpio_switch 'poe_passthrough'
+ options:
+ name: 'PoE Passthrough'
+ gpio_pin: '0'
+ value: '0'
+
dropbear:
- name: dropbear
options:
@@ -239,5 +262,4 @@ openwrt_uci:
Port: '22000'
dhcp: "{{ openwrt_dhcp_base + openwrt_dhcp_internal + openwrt_dhcp_external }}"
-
network: "{{ openwrt_network_base + openwrt_network_internal + openwrt_network_external }}"