mirror of
https://github.com/zhaofengli/colmena.git
synced 2024-08-16 13:10:39 +03:00
Merge pull request #197 from minhuw/main
Support adding extra ssh options on node configurations
This commit is contained in:
commit
7997ab7187
@ -208,6 +208,13 @@ with builtins; rec {
|
|||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [ "sudo" "-H" "--" ];
|
default = [ "sudo" "-H" "--" ];
|
||||||
};
|
};
|
||||||
|
sshOptions = lib.mkOption {
|
||||||
|
description = mdDoc ''
|
||||||
|
Extra SSH options to pass to the SSH command.
|
||||||
|
'';
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -33,6 +33,9 @@ pub struct Ssh {
|
|||||||
/// Command to elevate privileges with.
|
/// Command to elevate privileges with.
|
||||||
privilege_escalation_command: Vec<String>,
|
privilege_escalation_command: Vec<String>,
|
||||||
|
|
||||||
|
/// extra SSH options
|
||||||
|
extra_ssh_options: Vec<String>,
|
||||||
|
|
||||||
/// Whether to use the experimental `nix copy` command.
|
/// Whether to use the experimental `nix copy` command.
|
||||||
use_nix3_copy: bool,
|
use_nix3_copy: bool,
|
||||||
|
|
||||||
@ -189,6 +192,7 @@ impl Ssh {
|
|||||||
port: None,
|
port: None,
|
||||||
ssh_config: None,
|
ssh_config: None,
|
||||||
privilege_escalation_command: Vec::new(),
|
privilege_escalation_command: Vec::new(),
|
||||||
|
extra_ssh_options: Vec::new(),
|
||||||
use_nix3_copy: false,
|
use_nix3_copy: false,
|
||||||
job: None,
|
job: None,
|
||||||
}
|
}
|
||||||
@ -206,6 +210,10 @@ impl Ssh {
|
|||||||
self.privilege_escalation_command = command;
|
self.privilege_escalation_command = command;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set_extra_ssh_options(&mut self, options: Vec<String>) {
|
||||||
|
self.extra_ssh_options = options;
|
||||||
|
}
|
||||||
|
|
||||||
pub fn set_use_nix3_copy(&mut self, enable: bool) {
|
pub fn set_use_nix3_copy(&mut self, enable: bool) {
|
||||||
self.use_nix3_copy = enable;
|
self.use_nix3_copy = enable;
|
||||||
}
|
}
|
||||||
@ -346,6 +354,7 @@ impl Ssh {
|
|||||||
]
|
]
|
||||||
.iter()
|
.iter()
|
||||||
.map(|s| s.to_string())
|
.map(|s| s.to_string())
|
||||||
|
.chain(self.extra_ssh_options.clone())
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
if let Some(port) = self.port {
|
if let Some(port) = self.port {
|
||||||
|
@ -78,6 +78,9 @@ pub struct NodeConfig {
|
|||||||
#[serde(rename = "privilegeEscalationCommand")]
|
#[serde(rename = "privilegeEscalationCommand")]
|
||||||
privilege_escalation_command: Vec<String>,
|
privilege_escalation_command: Vec<String>,
|
||||||
|
|
||||||
|
#[serde(rename = "sshOptions")]
|
||||||
|
extra_ssh_options: Vec<String>,
|
||||||
|
|
||||||
#[validate(custom = "validate_keys")]
|
#[validate(custom = "validate_keys")]
|
||||||
keys: HashMap<String, Key>,
|
keys: HashMap<String, Key>,
|
||||||
}
|
}
|
||||||
@ -181,6 +184,7 @@ impl NodeConfig {
|
|||||||
self.target_host.as_ref().map(|target_host| {
|
self.target_host.as_ref().map(|target_host| {
|
||||||
let mut host = Ssh::new(self.target_user.clone(), target_host.clone());
|
let mut host = Ssh::new(self.target_user.clone(), target_host.clone());
|
||||||
host.set_privilege_escalation_command(self.privilege_escalation_command.clone());
|
host.set_privilege_escalation_command(self.privilege_escalation_command.clone());
|
||||||
|
host.set_extra_ssh_options(self.extra_ssh_options.clone());
|
||||||
|
|
||||||
if let Some(target_port) = self.target_port {
|
if let Some(target_port) = self.target_port {
|
||||||
host.set_port(target_port);
|
host.set_port(target_port);
|
||||||
|
@ -248,6 +248,7 @@ mod tests {
|
|||||||
build_on_target: false,
|
build_on_target: false,
|
||||||
replace_unknown_profiles: false,
|
replace_unknown_profiles: false,
|
||||||
privilege_escalation_command: vec![],
|
privilege_escalation_command: vec![],
|
||||||
|
extra_ssh_options: vec![],
|
||||||
keys: HashMap::new(),
|
keys: HashMap::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user