From a54d71818488ba9709fde199e3edaee91e2e0116 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 30 Dec 2018 12:18:37 +0100 Subject: make accesspoint group a little bit more generic --- inventory/group_vars/accesspoints/main.yml | 6 +++--- inventory/group_vars/ele-ap/main.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'inventory') diff --git a/inventory/group_vars/accesspoints/main.yml b/inventory/group_vars/accesspoints/main.yml index c85f05f5..79d0ec75 100644 --- a/inventory/group_vars/accesspoints/main.yml +++ b/inventory/group_vars/accesspoints/main.yml @@ -23,11 +23,11 @@ accesspoint_network_base: - name: interface 'mgmt' options: - ifname: "{{ accesspoint_wired_interface }}.{{ network_zones.mgmt.vlan }}" + ifname: "{{ accesspoint_wired_interface }}{% if 'vlan' in network_mgmt_zone %}.{{ network_mgmt_zone.vlan }}{% endif %}" accept_ra: 0 proto: static - ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}" + netmask: "{{ network_mgmt_zone.prefix | ipaddr('netmask') }}" accesspoint_network_zones: {} diff --git a/inventory/group_vars/ele-ap/main.yml b/inventory/group_vars/ele-ap/main.yml index 09426e2a..e1dfc71c 100644 --- a/inventory/group_vars/ele-ap/main.yml +++ b/inventory/group_vars/ele-ap/main.yml @@ -1,4 +1,6 @@ --- +network_mgmt_zone: "{{ network_zones.mgmt }}" + accesspoint_wifi_channels: 2g4: ele-ap-forum0: 3 -- cgit v1.2.3