diff --git a/host_vars/sw-ec-1.yml b/host_vars/sw-ec-1.yml index 30fa30b..f78cf4c 100644 --- a/host_vars/sw-ec-1.yml +++ b/host_vars/sw-ec-1.yml @@ -1,7 +1,7 @@ --- switch_vars: name: sw-ec-1 - location: Local de Brassage EdC + location: "Local_de_Brassage_EdC" host: 10.130.4.11 port: 80 username: "{{ vault_switch.username }}" @@ -9,113 +9,85 @@ switch_vars: delete_vlans: [] vlans: - id: 40 - name: "Filaire_edc" - tagged: "{{ '9-10,14,16,18,22-25' | range2list }}" + name: "Filaire_EDC" + tagged: "{{ '9-10,12,14,16,18,20,22-25' | range2list }}" - id: 41 - name: "Wifi_edc" - tagged: "{{ '5-10,14,16,18,22-25' | range2list }}" + name: "Wifi_EDC" + tagged: "{{ '5-10,12,14,16,18,20,22-25' | range2list }}" - id: 42 - name: "Banni_edc" - tagged: "{{ '5-10,14,16,18,22-25' | range2list }}" + name: "Banni_EDC" + tagged: "{{ '5-10,12,14,16,18,20,22-25' | range2list }}" - id: 43 - name: "Accueil_edc" - tagged: "{{ '5-10,14,16,18,22-25' | range2list }}" + name: "Accueil_EDC" + tagged: "{{ '5-10,12,14,16,18,20,22-25' | range2list }}" - id: 110 - name: "Adherents_ip_publiques" - tagged: "{{ '9-10,14,16,18,22-25' | range2list }}" + name: "Adherents_IP_Publiques" + tagged: "{{ '9-10,12,14,16,18,20,22-25' | range2list }}" - id: 111 - name: "Serveurs_ip_publiques" + name: "Serveurs_IP_Publiques" tagged: "{{ '25' | range2list }}" - id: 131 name: "Onduleurs" tagged: [25] - id: 144 - name: "Bornes_wifi_edc" + name: "Bornes_Wifi_EDC" tagged: [25] - untagged: "{{ '5-10,14,16,18,22-24' | range2list }}" + untagged: "{{ '5-8,12,14,16,18,20,22-24' | range2list }}" ports: - id: 1 - name: "Room_edc_Aile_Ouest_363" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_363" - id: 2 - name: "Room_edc_Aile_Ouest_364" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_364" - id: 3 - name: "Room_edc_Aile_Principale_Foyer_1" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Principale_Foyer_1" - id: 4 - name: "Room_edc_Aile_Principale_Foyer_2" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Principale_Foyer_2" - id: 5 - name: "Machine_ep-0-1.borne.auro.re" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Borne_Principale_0_1" - id: 6 - name: "Machine_ep-1-1.borne.auro.re" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Borne_Principale_1_1" - id: 7 - name: "Machine_ep-1-2.borne.auro.re" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Borne_Principale_1_2" - id: 8 - name: "Machine_ep-1-3.borne.auro.re" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Borne_Principale_1_3" - id: 9 - name: "Room_edc_Aile_Ouest_352" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_352" - id: 10 - name: "Room_edc_Aile_Ouest_252" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_252" - id: 11 - name: "Room_edc_Aile_Ouest_273" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_273" + - id: 12 + name: "Borne_Est_2_3" - id: 13 - name: "Room_edc_Aile_Ouest_261" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_261" - id: 14 - name: "Room_edc_Aile_Ouest_272" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_272" - id: 15 - name: "Room_edc_Aile_Ouest_262" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_262" - id: 16 - name: "Room_edc_Aile_Est_225" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Est_225" - id: 17 - name: "Room_edc_Aile_Ouest_263" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_263" - id: 18 - name: "Room_edc_Aile_Ouest_76" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_76" - id: 19 - name: "Room_edc_Aile_Ouest_264" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_264" + - id: 20 + name: "Room_Ouest_58" - id: 21 - name: "Room_edc_Aile_Ouest_265" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_265" + - id: 22 + name: "Not_used" - id: 23 - name: "Room_edc_Aile_Ouest_158" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Room_Ouest_158" - id: 24 - name: "Room_edc_Aile_Ouest_158" - lldp: "LPAS_TX_AND_RX" - loop_protect: true + name: "Not_used" + # id: 25 + # name: "Management_DO_NOT_UNCOMMENT" + - id: 26 + name: "Not_used" + - id: 27 + name: "Not_used" + - id: 28 + name: "Not_used" ... diff --git a/roles/switch-ports/tasks/main.yml b/roles/switch-ports/tasks/main.yml index 12482d0..0eff2b2 100644 --- a/roles/switch-ports/tasks/main.yml +++ b/roles/switch-ports/tasks/main.yml @@ -28,7 +28,7 @@ - path: "{{ item.id }}" data: port_id: "{{ item.id | string }}" - admin_status: "{{ 'LPAS_TX_AND_RX' if item.lldp is defined and item.lldp else 'LPAS_DISABLED' }}" + admin_status: "{{ 'LPAS_DISABLED' if item.disable_lldp is defined and item.disable_lldp else 'LPAS_TX_AND_RX' }}" loop: "{{ switch_vars.ports }}" - name: Configure loop-protect @@ -43,6 +43,6 @@ path: "loop_protect/ports/{{ item.id }}" data: port_id: "{{ item.id | string }}" - is_loop_protection_enabled: "{{ item.loop_protect | default(False) }}" + is_loop_protection_enabled: "{{ item.disable_loop_protect | default(True) }}" loop: "{{ switch_vars.ports }}" ...