Skip to content

Commit

Permalink
Package omdb into switch zone (#4840)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewjstone authored Jan 19, 2024
1 parent c998469 commit 1ae97e4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
19 changes: 16 additions & 3 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand All @@ -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"

Expand All @@ -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"

Expand All @@ -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
2 changes: 1 addition & 1 deletion smf/profile/profile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1ae97e4

Please sign in to comment.