ansible: move labs to individal folders

Signed-off-by: Paul Spooren <mail@aparcar.org>

Author: aparcar

…ible/files/exporter/labgrid-aparcar.yaml …s/exporter/labgrid-aparcar/exporter.yamlansible/files/exporter/labgrid-aparcar.yaml renamed to ansible/files/exporter/labgrid-aparcar/exporter.yaml ansible/files/exporter/labgrid-aparcar.yaml renamed to ansible/files/exporter/labgrid-aparcar/exporter.yaml

@@ -1,114 +1,123 @@
-labgrid-aparcar-genexis_pulse-ex400:
-  location: aparcar-desk
-  USBSerialPort:
-    match:
-      ID_PATH: platform-xhci-hcd.1-usb-0:1.1.3:1.0
+labgrid-aparcar-bananapi_bpi-r4:
+  NetworkService:
+    address: 192.168.1.1%vlan103
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 3
     pdu: 192.168.128.2
-    index: 1
   TFTPProvider:
-    internal: "/srv/tftp/genexis_pulse-ex400/"
-    external: "genexis_pulse-ex400/"
-  NetworkService:
-    address: "192.168.1.1%vlan101"
-    username: "root"
-
-labgrid-aparcar-tplink_tl-wdr3600-v1:
-  location: aparcar-desk
+    external: bananapi_bpi-r4/
+    internal: /srv/tftp/bananapi_bpi-r4/
   USBSerialPort:
     match:
-      ID_PATH: platform-xhci-hcd.1-usb-0:1.1.1:1.0
+      ID_PATH: platform-xhci-hcd.1-usb-0:1.1.2:1.0
+
+labgrid-aparcar-enterasys_ws-ap3710i:
+  NetworkService:
+    address: 192.168.1.1%vlan112
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 12
     pdu: 192.168.128.2
-    index: 2
   TFTPProvider:
-    internal: "/srv/tftp/tplink_tl-wdr3600-v1/"
-    external: "tplink_tl-wdr3600-v1/"
-    external_ip: "192.168.102.1"
-  NetworkService:
-    address: "192.168.1.1%vlan102"
-    username: "root"
-
-labgrid-aparcar-openwrt_one:
-  location: aparcar-desk
+    external: enterasys_ws-ap3710i/
+    external_ip: 192.168.112.1
+    internal: /srv/tftp/enterasys_ws-ap3710i/
   USBSerialPort:
     match:
-      ID_PATH: platform-xhci-hcd.0-usb-0:1:1.0
+      ID_PATH: platform-xhci-hcd.0-usb-0:2.4:1.0
+
+labgrid-aparcar-genexis_pulse-ex400:
+  NetworkService:
+    address: 192.168.1.1%vlan101
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 1
     pdu: 192.168.128.2
-    index: 3
   TFTPProvider:
-    internal: "/srv/tftp/openwrt_one/"
-    external: "openwrt_one/"
-  NetworkService:
-    address: "192.168.1.1%vlan104"
-    username: "root"
-
-labgrid-aparcar-bananapi_bpi-r4:
-  location: aparcar-desk
+    external: genexis_pulse-ex400/
+    internal: /srv/tftp/genexis_pulse-ex400/
   USBSerialPort:
     match:
-      ID_PATH: platform-xhci-hcd.1-usb-0:1.1.2:1.0
+      ID_PATH: platform-xhci-hcd.1-usb-0:1.1.3:1.0
+
+labgrid-aparcar-glinet_gl-mt6000:
+  NetworkService:
+    address: 192.168.1.1%vlan107
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 7
     pdu: 192.168.128.2
-    index: 5
   TFTPProvider:
-    internal: "/srv/tftp/bananapi_bpi-r4/"
-    external: "bananapi_bpi-r4/"
-  NetworkService:
-    address: "192.168.1.1%vlan105"
-    username: "root"
-
-labgrid-aparcar-enterasys_ws-ap3710i:
-  location: aparcar-desk
+    external: glinet_gl-mt6000/
+    external_ip: 192.168.107.1
+    internal: /srv/tftp/glinet_gl-mt6000/
   USBSerialPort:
     match:
-      ID_PATH: platform-xhci-hcd.0-usb-0:2.4:1.0
+      ID_PATH: platform-xhci-hcd.0-usb-0:2.1.1:1.0
+
+labgrid-aparcar-openwrt_one:
+  NetworkService:
+    address: 192.168.1.1%vlan116
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 5
     pdu: 192.168.128.2
-    index: 6
   TFTPProvider:
-    internal: "/srv/tftp/enterasys_ws-ap3710i/"
-    external: "enterasys_ws-ap3710i/"
-    external_ip: "192.168.106.1"
-  NetworkService:
-    address: "192.168.1.1%vlan106"
-    username: "root"
-
-labgrid-aparcar-glinet_gl-mt6000:
-  location: aparcar-desk
+    external: openwrt_one/
+    internal: /srv/tftp/openwrt_one/
   USBSerialPort:
     match:
-      ID_PATH: platform-xhci-hcd.0-usb-0:2.1.1:1.0
+      ID_PATH: platform-xhci-hcd.0-usb-0:1.1.4:1.0
+
+labgrid-aparcar-rpi-4:
+  NetworkService:
+    address: 192.168.1.1%vlan104
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 4
     pdu: 192.168.128.2
-    index: 7
-  TFTPProvider:
-    internal: "/srv/tftp/glinet_gl-mt6000/"
-    external: "glinet_gl-mt6000/"
-    external_ip: "192.168.107.1"
-  NetworkService:
-    address: "192.168.1.1%vlan107"
-    username: "root"
-
-labgrid-aparcar-rpi-4:
-  location: aparcar-desk
+  USBSDMuxDevice:
+    match:
+      ID_PATH: platform-xhci-hcd.1-usb-0:1.2.1
   USBSerialPort:
     match:
       ID_PATH: platform-xhci-hcd.1-usb-0:1.1.4:1.0
+
+labgrid-aparcar-tplink_tl-wdr3600-v1:
+  NetworkService:
+    address: 192.168.1.1%vlan102
+    username: root
   PDUDaemonPort:
     host: localhost:16421
+    index: 2
     pdu: 192.168.128.2
-    index: 8
+  TFTPProvider:
+    external: tplink_tl-wdr3600-v1/
+    external_ip: 192.168.102.1
+    internal: /srv/tftp/tplink_tl-wdr3600-v1/
+  USBSerialPort:
+    match:
+      ID_PATH: platform-xhci-hcd.1-usb-0:1.1.1:1.0
+
+labgrid-aparcar-ignitenet_ss-w2-ac2600:
   NetworkService:
-    address: "192.168.1.1%vlan108"
-    username: "root"
-  USBSDMuxDevice:
+    address: 192.168.1.1%vlan11
+    username: root
+  PDUDaemonPort:
+    host: localhost:16421
+    index: 11
+    pdu: 192.168.128.2
+  TFTPProvider:
+    external: ignitenet_ss-w2-ac2600/
+    external_ip: 192.168.111.1
+    internal: /srv/tftp/ignitenet_ss-w2-ac2600/
+  USBSerialPort:
     match:
-      ID_PATH: platform-xhci-hcd.1-usb-0:1.2.1
+      ID_PATH: platform-xhci-hcd.1-usb-0:2.1.4:1.0

ansible/playbook_labgrid.yml

@@ -204,9 +204,10 @@
         mode: "0755"
       loop: "{{ hostvars[inventory_hostname]['labs'][inventory_hostname]['devices'] }}"
 
+
     - name: Copy exporter configuration
       template:
-        src: files/exporter/{{ inventory_hostname }}.yaml
+        src: files/exporter/{{ inventory_hostname }}/exporter.yaml
         dest: /etc/labgrid/exporter.yaml
       notify:
         - Restart labgrid-exporter