From 1ae97e49d8698974989fe23ba5e5a8c421a24949 Mon Sep 17 00:00:00 2001
From: "Andrew J. Stone" <andrew@oxidecomputer.com>
Date: Fri, 19 Jan 2024 12:45:51 -0500
Subject: [PATCH] Package omdb into switch zone (#4840)

---
 package-manifest.toml | 19 ++++++++++++++++---
 smf/profile/profile   |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/package-manifest.toml b/package-manifest.toml
index 16f8f70c73..7b12583437 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -348,6 +348,7 @@ source.paths = [
   { from = "smf/switch_zone_setup/manifest.xml", to = "/var/svc/manifest/site/switch_zone_setup/manifest.xml" },
   { from = "smf/switch_zone_setup/switch_zone_setup", to = "/opt/oxide/bin/switch_zone_setup" },
   { from = "smf/switch_zone_setup/support_authorized_keys", to = "/opt/oxide/support/authorized_keys" },
+  { from = "/opt/ooce/pgsql-13/lib/amd64", to = "/opt/ooce/pgsql-13/lib/amd64" },
 ]
 output.type = "zone"
 output.intermediate_only = true
@@ -566,7 +567,8 @@ source.packages = [
   "mg-ddm.tar.gz",
   "mgd.tar.gz",
   "switch_zone_setup.tar.gz",
-  "xcvradm.tar.gz"
+  "xcvradm.tar.gz",
+  "omicron-omdb.tar.gz"
 ]
 output.type = "zone"
 
@@ -588,7 +590,8 @@ source.packages = [
   "mg-ddm.tar.gz",
   "mgd.tar.gz",
   "switch_zone_setup.tar.gz",
-  "sp-sim-stub.tar.gz"
+  "sp-sim-stub.tar.gz",
+  "omicron-omdb.tar.gz"
 ]
 output.type = "zone"
 
@@ -610,7 +613,8 @@ source.packages = [
   "mg-ddm.tar.gz",
   "mgd.tar.gz",
   "switch_zone_setup.tar.gz",
-  "sp-sim-softnpu.tar.gz"
+  "sp-sim-softnpu.tar.gz",
+  "omicron-omdb.tar.gz"
 ]
 output.type = "zone"
 
@@ -625,3 +629,12 @@ source.paths = [
 ]
 output.type = "zone"
 output.intermediate_only = true
+
+[package.omicron-omdb]
+service_name = "omdb"
+only_for_targets.image = "standard"
+source.type = "local"
+source.rust.binary_names = ["omdb"]
+source.rust.release = true
+output.type = "zone"
+output.intermediate_only = true
diff --git a/smf/profile/profile b/smf/profile/profile
index 8f613d4d56..73256cd6fd 100644
--- a/smf/profile/profile
+++ b/smf/profile/profile
@@ -4,7 +4,7 @@ PATH+=:/opt/ooce/bin
 case "$HOSTNAME" in
     oxz_switch)
 	# Add tools like xcvradm, swadm & ddmadm to the PATH by default
-	PATH+=:/opt/oxide/bin:/opt/oxide/dendrite/bin:/opt/oxide/mg-ddm/bin
+	PATH+=:/opt/oxide/bin:/opt/oxide/dendrite/bin:/opt/oxide/mg-ddm/bin:/opt/oxide/omdb/bin
 	;;
     oxz_cockroachdb*)
 	PATH+=:/opt/oxide/cockroachdb/bin