Merge remote-tracking branch 'origin/doc/pxe_test_setup' into doc/pxe_test_setup

examples/okd_pxe/Cargo.toml

@@ -10,6 +10,8 @@ publish = false
 harmony = { path = "../../harmony" }
 harmony_cli = { path = "../../harmony_cli" }
 harmony_types = { path = "../../harmony_types" }
+harmony_secret = { path = "../../harmony_secret" }
+harmony_secret_derive = { path = "../../harmony_secret_derive" }
 cidr = { workspace = true }
 tokio = { workspace = true }
 harmony_macros = { path = "../../harmony_macros" }
@@ -17,3 +19,4 @@ log = { workspace = true }
 env_logger = { workspace = true }
 url = { workspace = true }
 askama = "0.14.0"
+serde.workspace = true

examples/okd_pxe/src/main.rs

@@ -22,7 +22,7 @@ async fn main() {
     let cluster_pubkey_filename = "cluster_ssh_key.pub";
     let harmony_inventory_agent = "harmony_inventory_agent";
 
-    // TODO this should be a single IPXEScore instead of having the user do this step by step
+    // TODO: this should be a single IPXEScore instead of having the user do this step by step
     let scores: Vec<Box<dyn Score<HAClusterTopology>>> = vec![
         Box::new(DhcpScore {
             host_binding: vec![],

examples/okd_pxe/src/topology.rs

@@ -8,6 +8,14 @@ use harmony::{
     topology::{HAClusterTopology, LogicalHost, UnmanagedRouter},
 };
 use harmony_macros::{ip, ipv4};
+use harmony_secret::{Secret, SecretManager};
+use serde::{Deserialize, Serialize};
+
+#[derive(Secret, Serialize, Deserialize, Debug, PartialEq)]
+struct OPNSenseFirewallConfig {
+    username: String,
+    password: String,
+}
 
 pub async fn get_topology() -> HAClusterTopology {
     let firewall = harmony::topology::LogicalHost {
@@ -15,8 +23,17 @@ pub async fn get_topology() -> HAClusterTopology {
         name: String::from("opnsense-1"),
     };
 
+    let config = SecretManager::get::<OPNSenseFirewallConfig>().await;
+    let config = config.unwrap();
+
     let opnsense = Arc::new(
-        harmony::infra::opnsense::OPNSenseFirewall::new(firewall, None, "root", "opnsense").await,
+        harmony::infra::opnsense::OPNSenseFirewall::new(
+            firewall,
+            None,
+            &config.username,
+            &config.password,
+        )
+        .await,
     );
     let lan_subnet = ipv4!("192.168.1.0");
     let gateway_ipv4 = ipv4!("192.168.1.1");