Update and add FEI PDU configs and instance files

config/hspower/hspower_fei1.yaml

@@ -1,18 +1,18 @@
-# HISPEC FEI PDU 1 of 2 (feieaton1) — Eaton EMAT-08/10 networked PDU
+# HISPEC FEI PDU 1 of 4 (feidcpdu1) — DLI DC3 (48V) networked PDU
 #
-# First of the two Eaton PDUs in the FEI (front end instrument).
+# First of the two DLI DC PDUs in the FEI (front end instrument).
 #
 # Usage:
-#   daemons/hspower/eaton_pdu -c config/hspower/hspower_fei1.yaml
+#   daemons/hspower/dli_pdu -c config/hspower/hspower_fei1.yaml
 
 peer_id: fei1
 group_id: hspower
 
 hardware:
-  # feieaton1, per the /etc/hosts table in
+  # feidcpdu1, per the /etc/hosts table in
   # docs/build_notes/host_machine_build_notes.rst
-  ip_address: 192.168.29.105
-  tcp_port: 23
+  ip_address: 192.168.29.110
+  tcp_port: 22
   # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has
   # ten, and this is what decides how many outlet keyword blocks exist; the
   # daemon logs a warning at startup if it disagrees with the count the PDU
@@ -23,7 +23,7 @@ hardware:
   # docs/operations/systemd.md). All nine PDUs share one login today; point an instance
   # at different variables if its unit gets its own.
   username_env: HISPEC_PDU_USERNAME
-  password_env: HISPEC_PDU_PASSWORD
+  password_env: HISPEC_FEIDLIPDU_PASSWORD
 
 logging:
   level: INFO

config/hspower/hspower_fei2.yaml

@@ -1,18 +1,18 @@
-# HISPEC FEI PDU 2 of 2 (feieaton2) — Eaton EMAT-08/10 networked PDU
+# HISPEC FEI PDU 2 of 4 (feidcpdu2) —  DLI DC3 (48V/24V) networked PDU
 #
-# Second of the two Eaton PDUs in the FEI (front end instrument).
+# Second of the two DLI DC PDUs in the FEI (front end instrument).
 #
 # Usage:
-#   daemons/hspower/eaton_pdu -c config/hspower/hspower_fei2.yaml
+#   daemons/hspower/dli_pdu -c config/hspower/hspower_fei2.yaml
 
 peer_id: fei2
 group_id: hspower
 
 hardware:
-  # feieaton2, per the /etc/hosts table in
+  # feidcpdu2, per the /etc/hosts table in
   # docs/build_notes/host_machine_build_notes.rst
-  ip_address: 192.168.29.106
-  tcp_port: 23
+  ip_address: 192.168.29.102
+  tcp_port: 22
   # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has
   # ten, and this is what decides how many outlet keyword blocks exist; the
   # daemon logs a warning at startup if it disagrees with the count the PDU
@@ -23,7 +23,7 @@ hardware:
   # docs/operations/systemd.md). All nine PDUs share one login today; point an instance
   # at different variables if its unit gets its own.
   username_env: HISPEC_PDU_USERNAME
-  password_env: HISPEC_PDU_PASSWORD
+  password_env: HISPEC_FEIDLIPDU_PASSWORD
 
 logging:
   level: INFO

config/hspower/hspower_fei3.yaml

@@ -0,0 +1,29 @@
+# HISPEC FEI PDU 3 of 4 (feieaton1) — Eaton EMAT-08/10 networked PDU
+#
+# First of the two Eaton PDUs in the FEI (front end instrument).
+#
+# Usage:
+#   daemons/hspower/eaton_pdu -c config/hspower/hspower_fei3.yaml
+
+peer_id: fei3
+group_id: hspower
+
+hardware:
+  # feieaton1, per the /etc/hosts table in
+  # docs/build_notes/host_machine_build_notes.rst.
+  ip_address: 192.168.29.105
+  tcp_port: 23
+  # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has
+  # ten, and this is what decides how many outlet keyword blocks exist; the
+  # daemon logs a warning at startup if it disagrees with the count the PDU
+  # reports.
+  outlet_count: 8
+  # Telnet login. The values never appear here: these name environment
+  # variables the daemon reads, set root-only in /etc/hispec/secrets.env (see
+  # docs/operations/systemd.md). All nine PDUs share one login today; point an instance
+  # at different variables if its unit gets its own.
+  username_env: HISPEC_PDU_USERNAME
+  password_env: HISPEC_FEIEATON1_PASSWORD
+
+logging:
+  level: INFO

config/hspower/hspower_fei4.yaml

@@ -0,0 +1,29 @@
+# HISPEC FEI PDU 4 of 4 (feieaton2) — Eaton EMAT-08/10 networked PDU
+#
+# Second of the two Eaton PDUs in the FEI (front end instrument).
+#
+# Usage:
+#   daemons/hspower/eaton_pdu -c config/hspower/hspower_fei4.yaml
+
+peer_id: fei4
+group_id: hspower
+
+hardware:
+  # feieaton2, per the /etc/hosts table in
+  # docs/build_notes/host_machine_build_notes.rst.
+  ip_address: 192.168.29.106
+  tcp_port: 23
+  # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has
+  # ten, and this is what decides how many outlet keyword blocks exist; the
+  # daemon logs a warning at startup if it disagrees with the count the PDU
+  # reports.
+  outlet_count: 8
+  # Telnet login. The values never appear here: these name environment
+  # variables the daemon reads, set root-only in /etc/hispec/secrets.env (see
+  # docs/operations/systemd.md). All nine PDUs share one login today; point an instance
+  # at different variables if its unit gets its own.
+  username_env: HISPEC_PDU_USERNAME
+  password_env: HISPEC_FEIEATON2_PASSWORD
+
+logging:
+  level: INFO

systemd/instances/hspower_fei1.env

@@ -1,14 +1,14 @@
-# HISPEC FEI PDU 1 of 2 (feieaton1) — Eaton EMAT-08/10 networked PDU (hspower)
+# HISPEC FEI PDU 1 of 4 (feidcpdu1) — DLI DC3 (48V) networked PDU (hspower)
 #
 #   hispec deploy hspower_fei1
 #
 # copies this file to /etc/hispec/instances/hspower_fei1.env and
 # config/hspower/hspower_fei1.yaml to /etc/hispec/hspower_fei1.yaml, then
 # enables and starts the daemon.
 #
-# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_PDU_PASSWORD in
-# root-only /etc/hispec/secrets.env, not from here: this file is readable by
+# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIDLIPDU_PASSWORD
+# in root-only /etc/hispec/secrets.env, not from here: this file is readable by
 # every hispec-ops member.
-HISPEC_DAEMON=hspower/eaton_pdu
+HISPEC_DAEMON=hspower/dli_pdu
 HISPEC_CONFIG=/etc/hispec/hspower_fei1.yaml
 HISPEC_HOST=hispecserver

systemd/instances/hspower_fei2.env

@@ -1,14 +1,14 @@
-# HISPEC FEI PDU 2 of 2 (feieaton2) — Eaton EMAT-08/10 networked PDU (hspower)
+# HISPEC FEI PDU 2 of 4 (feidcpdu2) — DLI DC3 (48V/24V) networked PDU (hspower)
 #
 #   hispec deploy hspower_fei2
 #
 # copies this file to /etc/hispec/instances/hspower_fei2.env and
 # config/hspower/hspower_fei2.yaml to /etc/hispec/hspower_fei2.yaml, then
 # enables and starts the daemon.
 #
-# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_PDU_PASSWORD in
-# root-only /etc/hispec/secrets.env, not from here: this file is readable by
+# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIDLIPDU_PASSWORD
+# in root-only /etc/hispec/secrets.env, not from here: this file is readable by
 # every hispec-ops member.
-HISPEC_DAEMON=hspower/eaton_pdu
+HISPEC_DAEMON=hspower/dli_pdu
 HISPEC_CONFIG=/etc/hispec/hspower_fei2.yaml
 HISPEC_HOST=hispecserver

systemd/instances/hspower_fei3.env

@@ -0,0 +1,14 @@
+# HISPEC FEI PDU 3 of 4 (feieaton1) — Eaton EMAT-08/10 networked PDU (hspower)
+#
+#   hispec deploy hspower_fei3
+#
+# copies this file to /etc/hispec/instances/hspower_fei3.env and
+# config/hspower/hspower_fei3.yaml to /etc/hispec/hspower_fei3.yaml, then
+# enables and starts the daemon.
+#
+# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIEATON1_PASSWORD
+# in root-only /etc/hispec/secrets.env, not from here: this file is readable by
+# every hispec-ops member.
+HISPEC_DAEMON=hspower/eaton_pdu
+HISPEC_CONFIG=/etc/hispec/hspower_fei3.yaml
+HISPEC_HOST=hispecserver

systemd/instances/hspower_fei4.env

@@ -0,0 +1,14 @@
+# HISPEC FEI PDU 4 of 4 (feieaton2) — Eaton EMAT-08/10 networked PDU (hspower)
+#
+#   hispec deploy hspower_fei4
+#
+# copies this file to /etc/hispec/instances/hspower_fei4.env and
+# config/hspower/hspower_fei4.yaml to /etc/hispec/hspower_fei4.yaml, then
+# enables and starts the daemon.
+#
+# The Telnet login comes from HISPEC_PDU_USERNAME and HISPEC_FEIEATON2_PASSWORD
+# in root-only /etc/hispec/secrets.env, not from here: this file is readable by
+# every hispec-ops member.
+HISPEC_DAEMON=hspower/eaton_pdu
+HISPEC_CONFIG=/etc/hispec/hspower_fei4.yaml
+HISPEC_HOST=hispecserver