Skip to content

Commit c7cdcfc

Browse files
authored
Update propolis (#81)
* Update to latest propolis commit * Update buildomat artefact for propolis-server
1 parent 7aa10fa commit c7cdcfc

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ slog = { version = "2.7", features = ["max_level_trace"] }
2929
slog-term = "2.7"
3030
slog-async = "2.7"
3131
slog-envlogger = "2.2"
32-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "d6fc6d458e08e7ae1008aaa2d505a6523a4e3538" }
33-
propolis-server-config = { git = "https://github.com/oxidecomputer/propolis", rev = "d6fc6d458e08e7ae1008aaa2d505a6523a4e3538" }
32+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "722bedc069fed1fdd8e465cbc106cc3a684d744b" }
33+
propolis-server-config = { git = "https://github.com/oxidecomputer/propolis", rev = "722bedc069fed1fdd8e465cbc106cc3a684d744b" }
3434
toml = "0.7"
3535
libc = "0.2"
3636
tokio = { version = "1", features = ["full"] }

get-propolis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
curl -OL https://buildomat.eng.oxide.computer/wg/0/artefact/01HWT9E3HTD7M58MD1VJP8ZZ09/a5obopISYhQaVlQ4PX8dfGWIowWs51drDMzVkTK2DBoo2D0I/01HWT9EP3DVZGG1RW0QYTXS5DY/01HWTA6K1RQWGH45ECTGFJJ3E1/propolis-server
3+
curl -OL https://buildomat.eng.oxide.computer/wg/0/artefact/01J47SP5WG406KHSV43K8TBVVA/Mm53OBbS1Seynk2zC2N6BFMdCRUVzr8t66s78CGOIbFBpqFa/01J47SPHH2ST71530E4YT9EP3Z/01J47TB8PB1FG0A299WCNP1B04/propolis-server
44
chmod +x propolis-server
55
pfexec mv propolis-server /usr/bin/

lib/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,6 +1404,10 @@ pub(crate) async fn launch_vm(
14041404
metadata: InstanceMetadata {
14051405
project_id: uuid::Uuid::nil(),
14061406
silo_id: uuid::Uuid::nil(),
1407+
sled_id: uuid::Uuid::nil(),
1408+
sled_model: "falcon".to_owned(),
1409+
sled_serial: "falcon".to_owned(),
1410+
sled_revision: 0,
14071411
},
14081412
};
14091413
let req = propolis_client::types::InstanceEnsureRequest {

0 commit comments

Comments
 (0)