fix git merge conflict

2025-12-17 17:09:32 -05:00
parent 8ee3f8a4ad 03e98a51e3
commit 07e610c54a
34 changed files with 837 additions and 343 deletions
--- a/examples/okd_installation/src/main.rs
+++ b/examples/okd_installation/src/main.rs
@@ -4,7 +4,10 @@ use crate::topology::{get_inventory, get_topology};
 use harmony::{
    config::secret::SshKeyPair,
    data::{FileContent, FilePath},
-    modules::okd::{installation::OKDInstallationPipeline, ipxe::OKDIpxeScore},
+    modules::{
+        inventory::HarmonyDiscoveryStrategy,
+        okd::{installation::OKDInstallationPipeline, ipxe::OKDIpxeScore},
+    },
    score::Score,
    topology::HAClusterTopology,
 };
@@ -26,7 +29,8 @@ async fn main() {
        },
    })];

-    scores.append(&mut OKDInstallationPipeline::get_all_scores().await);
+    scores
+        .append(&mut OKDInstallationPipeline::get_all_scores(HarmonyDiscoveryStrategy::MDNS).await);

    harmony_cli::run(inventory, topology, scores, None)
        .await