Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set up Recovery Silo and user during rack initialization #2943

Merged
merged 9 commits into from
May 3, 2023
Merged

set up Recovery Silo and user during rack initialization #2943

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e5a955d
set up Recovery Silo and user during rack initialization
davepacheco Apr 27, 2023
5181a64
omicron-dev run-all could print out more about the silo and user, plu…
davepacheco Apr 28, 2023
2317079
Merge branch 'main' into dap/initial-setup
davepacheco Apr 28, 2023
aedcf25
review feedback 1
davepacheco May 2, 2023
9293ea7
review feedback: better commonize and document the hardcoded password…
davepacheco May 2, 2023
7b3573b
Merge branch 'main' into dap/initial-setup
davepacheco May 2, 2023
4e58398
fix mismerge
davepacheco May 2, 2023
9833446
Merge branch 'main' into dap/initial-setup
davepacheco May 2, 2023
dd8fd1a
password could be simpler for interactive use
davepacheco May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions dev-tools/src/bin/omicron-dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,12 +370,17 @@ async fn cmd_run_all(args: &RunAllArgs) -> Result<(), anyhow::Error> {
cptestctx.external_dns_server.local_address()
);
println!(
" \
(e.g. `dig @{} -p {} SOME_DNS_NAME.{}`)",
"omicron-dev: e.g. `dig @{} -p {} {}.sys.{}`",
cptestctx.external_dns_server.local_address().ip(),
cptestctx.external_dns_server.local_address().port(),
cptestctx.silo_name,
cptestctx.external_dns_zone_name,
);
println!("omicron-dev: silo name: {}", cptestctx.silo_name,);
println!(
"omicron-dev: privileged user name: {}",
cptestctx.user_name.as_ref(),
);

// Wait for a signal.
let caught_signal = signal_stream.next().await;
Expand Down
1 change: 1 addition & 0 deletions nexus-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ omicron-common.workspace = true
progenitor.workspace = true
regress.workspace = true
reqwest = { workspace = true, features = ["rustls-tls", "stream"] }
schemars.workspace = true
serde.workspace = true
serde_json.workspace = true
slog.workspace = true
Expand Down
18 changes: 15 additions & 3 deletions nexus-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,21 @@
//! Interface for making API requests to the Oxide control plane at large
//! from within the control plane

use omicron_common::generate_logging_api;

generate_logging_api!("../openapi/nexus-internal.json");
progenitor::generate_api!(
spec = "../openapi/nexus-internal.json",
derives = [schemars::JsonSchema, PartialEq],
inner_type = slog::Logger,
pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {
slog::debug!(log, "client request";
"method" => %request.method(),
"uri" => %request.url(),
"body" => ?&request.body(),
);
}),
post_hook = (|log: &slog::Logger, result: &Result<_, _>| {
slog::debug!(log, "client response"; "result" => ?result);
}),
);

impl omicron_common::api::external::ClientError for types::Error {
fn message(&self) -> String {
Expand Down
Loading