Restructure en1 main inventory group

inventory/en1.old.yaml

@@ -0,0 +1,166 @@
+---
+workstation:
+  hosts:
+    voyager:
+      skylab_description: Personal Workstation
+      skylab_hostname: voyager.skylab.enp.one
+      skylab_targets: [workstation]
+
+en1:
+  vars:
+    skylab_location: Newton MA
+    skylab_dashboard: info.en1.local
+    # gross hack for now, will be refactored later
+    _skylab_adguard_nat_rule: 9
+
+  hosts:
+    core:
+      ansible_host: 10.42.101.1
+      ansible_port: 4242
+      ansible_network_os: edgeos
+      skylab_description: EN1 Core Router
+
+    iridium:
+      ansible_host: 10.42.101.200
+      skylab_description: Local Monitor Node
+      skylab_hostname: iridium.skylab.enp.one
+      skylab_targets: [network]
+      skylab_networking:
+        enp4s0:
+          firewall: internal
+          dhcp: false
+          gateway: 10.42.101.1/24
+          dns:
+            - 10.42.101.1
+          addresses:
+            - 10.42.101.200/24
+
+  children:
+
+    cluster:
+      vars:
+        skylab_targets: [cluster, datastore]
+        skylab_compose_version: 3.8
+        skylab_compose_dir: "{{ skylab_state_dir }}/compose"
+
+      hosts:
+        pegasus:  # jupiter
+          ansible_host: 10.42.101.100
+          skylab_hostname: pegasus.skylab.enp.one
+          skylab_legacy_names:
+            - jupiter.net.enp.one
+            - jupiter.svr.local
+          skylab_description: Arbiter Node
+          skylab_cluster:
+            address:
+              access: 10.42.101.10/24
+              internal: 192.168.42.10/24
+            interface:
+              access: bond0
+              internal: bond0.99
+          skylab_datastore_device: sdb
+          skylab_networking:
+            eno1:
+              bond: bond0
+            eno2:
+              bond: bond0
+            bond0:
+              device: bond
+              firewall: internal
+              gateway: 10.42.101.1/24
+              dns:
+                - 10.42.101.1
+              addresses:
+                - 10.42.101.100/24
+                - 192.168.255.255/32
+              dhcp: false
+            bond0.99:
+              device: vlan
+              firewall: trusted
+              addresses:
+                - 192.168.42.10/24
+              dhcp: false
+
+        saturn:  # remus
+          ansible_host: 10.42.101.110
+          skylab_hostname: saturn.skylab.enp.one
+          skylab_legacy_names:
+            - remus.net.enp.one
+            - remus.svr.local
+          skylab_description: Operational Node
+          skylab_cluster:
+            address:
+              access: 10.42.101.11/24
+              internal: 192.168.42.20/24
+            interface:
+              access: bond0
+              internal: bond0.99
+          skylab_networking:
+            eno1:
+              bond: bond0
+            eno2:
+              bond: bond0
+            bond0:
+              device: bond
+              firewall: internal
+              dhcp: false
+              gateway: 10.42.101.1/24
+              addresses:
+                - 10.42.101.110/24
+                - 192.168.255.255/32
+              dns:
+                - 10.42.101.1
+            bond0.99:
+              device: vlan
+              firewall: trusted
+              dhcp: false
+              addresses:
+                - 192.168.42.20/24
+
+        orion:  # romulus
+          ansible_host: 10.42.101.120
+          skylab_hostname: orion.skylab.enp.one
+          skylab_legacy_names:
+            - romulus.net.enp.one
+            - romulus.svr.local
+          skylab_description: Operational Node
+          skylab_cluster:
+            address:
+              access: 10.42.101.12/24
+              internal: 192.168.42.30/24
+            interface:
+              access: bond0
+              internal: bond0.99
+          skylab_datastore_device: sdb
+          skylab_networking:
+            eno1:
+              bond: bond0
+            eno2:
+              bond: bond0
+            bond0:
+              device: bond
+              firewall: internal
+              gateway: 10.42.101.1/24
+              dns:
+                - 10.42.101.1
+              addresses:
+                - 10.42.101.120/24
+                - 192.168.255.255/32
+              dhcp: false
+            bond0.99:
+              device: vlan
+              firewall: trusted
+              addresses:
+                - 192.168.42.30/24
+              dhcp: false
+
+en2:
+  vars:
+    skylab_location: DigitalOcean TOR1
+
+  hosts:
+    hubble:
+      ansible_host: en2a.enp.one
+      skylab_hostname: hubble.en2.enp.one
+      skylab_description: Cloud Web Server
+      skylab_targets: [cloud]

inventory/en1.yaml

@@ -1,175 +1,51 @@
 ---
-all:
-  children:
-    en1: {}
-
-  vars:
-    skylab_pip_version: 19.3.1
-    ansible_user: ansible
-    ansible_ssh_common_args: "-o ControlMaster=auto -o ControlPersist=60s -o ForwardAgent=yes"
-
-workstation:
-  hosts:
-    voyager:
-      skylab_description: Personal Workstation
-      skylab_hostname: voyager.skylab.enp.one
-      skylab_targets: [workstation]
-
 en1:
+
   vars:
-    skylab_location: Newton MA
+    skylab_location: Cambridge
-    skylab_dashboard: info.en1.local
-    # gross hack for now, will be refactored later
-    _skylab_adguard_nat_rule: 9
-
-  hosts:
-    core:
-      ansible_host: 10.42.101.1
-      ansible_port: 4242
-      ansible_network_os: edgeos
-      skylab_description: EN1 Core Router
-
-    iridium:
-      ansible_host: 10.42.101.200
-      skylab_description: Local Monitor Node
-      skylab_hostname: iridium.skylab.enp.one
-      skylab_targets: [network]
-      skylab_networking:
-        enp4s0:
-          firewall: internal
-          dhcp: false
-          gateway: 10.42.101.1/24
-          dns:
-            - 10.42.101.1
-          addresses:
-            - 10.42.101.200/24
 
   children:
+    domain:
+      children:
 
-    cluster:
+        cluster:
-      vars:
+          hosts:
-        skylab_targets: [cluster, datastore]
+            canaveral:
-        skylab_compose_version: 3.8
+              ansible_host: 10.42.101.10
-        skylab_compose_dir: "{{ skylab_state_dir }}/compose"
+              skylab_description: Compute and Storage Node
+            baikonur:
+              ansible_host: 10.42.101.11
+              skylab_description: Compute and Storage Node
+            vandenberg:
+              ansible_host: 10.42.101.12
+              skylab_description: Compute and Storage Node
+            andoya:
+              ansible_host: 10.42.101.13
+              skylab_description: Auxilary Compute Node
+            jiuquan:
+              ansible_host: 10.42.101.14
+              skylab_description: Auxilary Compute Node
 
+        datastore:
+          hosts:
+            canaveral:
+              skylab_datastore_block: /dev/sda
+            baikonur:
+              skylab_datastore_block: /dev/sda
+            vandenberg:
+              skylab_datastore_block: /dev/sda
+
+        hosts:
+          3d-printer: {}
+          mediastore: {}
+          backstore: {}
+
+    local:
       hosts:
-        pegasus:  # jupiter
+        core: {}
-          ansible_host: 10.42.101.100
+        switch-1: {}
-          skylab_hostname: pegasus.skylab.enp.one
+        switch-2: {}
-          skylab_legacy_names:
+        wap-1: {}
-            - jupiter.net.enp.one
+        wap-2: {}
-            - jupiter.svr.local
+        wap-3: {}
-          skylab_description: Arbiter Node
+        printer: {}
-          skylab_cluster:
-            address:
-              access: 10.42.101.10/24
-              internal: 192.168.42.10/24
-            interface:
-              access: bond0
-              internal: bond0.99
-          skylab_datastore_device: sdb
-          skylab_networking:
-            eno1:
-              bond: bond0
-            eno2:
-              bond: bond0
-            bond0:
-              device: bond
-              firewall: internal
-              gateway: 10.42.101.1/24
-              dns:
-                - 10.42.101.1
-              addresses:
-                - 10.42.101.100/24
-                - 192.168.255.255/32
-              dhcp: false
-            bond0.99:
-              device: vlan
-              firewall: trusted
-              addresses:
-                - 192.168.42.10/24
-              dhcp: false
-
-        saturn:  # remus
-          ansible_host: 10.42.101.110
-          skylab_hostname: saturn.skylab.enp.one
-          skylab_legacy_names:
-            - remus.net.enp.one
-            - remus.svr.local
-          skylab_description: Operational Node
-          skylab_cluster:
-            address:
-              access: 10.42.101.11/24
-              internal: 192.168.42.20/24
-            interface:
-              access: bond0
-              internal: bond0.99
-          skylab_networking:
-            eno1:
-              bond: bond0
-            eno2:
-              bond: bond0
-            bond0:
-              device: bond
-              firewall: internal
-              dhcp: false
-              gateway: 10.42.101.1/24
-              addresses:
-                - 10.42.101.110/24
-                - 192.168.255.255/32
-              dns:
-                - 10.42.101.1
-            bond0.99:
-              device: vlan
-              firewall: trusted
-              dhcp: false
-              addresses:
-                - 192.168.42.20/24
-
-        orion:  # romulus
-          ansible_host: 10.42.101.120
-          skylab_hostname: orion.skylab.enp.one
-          skylab_legacy_names:
-            - romulus.net.enp.one
-            - romulus.svr.local
-          skylab_description: Operational Node
-          skylab_cluster:
-            address:
-              access: 10.42.101.12/24
-              internal: 192.168.42.30/24
-            interface:
-              access: bond0
-              internal: bond0.99
-          skylab_datastore_device: sdb
-          skylab_networking:
-            eno1:
-              bond: bond0
-            eno2:
-              bond: bond0
-            bond0:
-              device: bond
-              firewall: internal
-              gateway: 10.42.101.1/24
-              dns:
-                - 10.42.101.1
-              addresses:
-                - 10.42.101.120/24
-                - 192.168.255.255/32
-              dhcp: false
-            bond0.99:
-              device: vlan
-              firewall: trusted
-              addresses:
-                - 192.168.42.30/24
-              dhcp: false
-
-en2:
-  vars:
-    skylab_location: DigitalOcean TOR1
-
-  hosts:
-    hubble:
-      ansible_host: en2a.enp.one
-      skylab_hostname: hubble.en2.enp.one
-      skylab_description: Cloud Web Server
-      skylab_targets: [cloud]

inventory/group_vars/all.yaml

@@ -1,4 +1,8 @@
 ---
+ansible_user: ansible
+
+ansible_port: 4242
+
 skylab_state_dir: /var/lib/skylab
 
 skylab_ansible_venv: "{{ skylab_state_dir }}/ansible-runtime"