[sled-agent] Self assembling switch zone

smf/mgs/manifest.xml

@@ -4,13 +4,18 @@
 <service_bundle type='manifest' name='mgs'>
 
 <service name='oxide/mgs' type='service' version='1'>
-  <create_default_instance enabled='false' />
+  <create_default_instance enabled='true' />
 
   <dependency name='multi_user' grouping='require_all' restart_on='none'
     type='service'>
   <service_fmri value='svc:/milestone/multi-user:default' />
   </dependency>
 
+  <dependency name='zone_network_setup' grouping='require_all' restart_on='none'
+    type='service'>
+  <service_fmri value='svc:/oxide/zone-network-setup:default' />
+  </dependency>
+
   <!--
     Most omicron services run their binary under `ctrun` because they spawn
     child processes that should be killed if the service is killed. However,

smf/switch_zone_setup/manifest.xml

@@ -11,10 +11,16 @@
     <service_fmri value='svc:/milestone/multi-user:default' />
   </dependency>
 
+  <dependency name='zone_network_setup' grouping='require_all' restart_on='none'
+    type='service'>
+  <service_fmri value='svc:/oxide/zone-network-setup:default' />
+  </dependency>
+
   <exec_method type='method' name='start' exec='/opt/oxide/bin/switch_zone_setup' timeout_seconds='300' />
   <exec_method type='method' name='stop' exec=':true' timeout_seconds='3' />
 
   <property_group name='startd' type='framework'>
+    <!-- TODO: Add propval for baseboard information -->
     <propval name='duration' type='astring' value='transient' />
   </property_group>
 

smf/switch_zone_setup/switch_zone_setup

@@ -46,4 +46,7 @@ for i in "${!USERS[@]}"; do
     fi
 done
 
+# TODO: Call /opt/oxide/zone-setup-cli/bin/zone-setup wicket-setup -b BASEBOARD_INFO here
+# Eventually we'll want all of the above code to be part of the zone-setup CLI as well
+
 exit $SMF_EXIT_OK

smf/wicketd/manifest.xml

@@ -4,13 +4,23 @@
 <service_bundle type='manifest' name='wicketd'>
 
 <service name='oxide/wicketd' type='service' version='1'>
-  <create_default_instance enabled='false' />
+  <create_default_instance enabled='true' />
 
   <dependency name='multi_user' grouping='require_all' restart_on='none'
     type='service'>
   <service_fmri value='svc:/milestone/multi-user:default' />
   </dependency>
 
+  <dependency name='zone_network_setup' grouping='require_all' restart_on='none'
+    type='service'>
+  <service_fmri value='svc:/oxide/zone-network-setup:default' />
+  </dependency>
+
+  <dependency name='switch_zone_setup' grouping='require_all' restart_on='none'
+    type='service'>
+  <service_fmri value='svc:/oxide/switch_zone_setup:default' />
+  </dependency>
+
   <exec_method type='method' name='start'
       exec='ctrun -l child -o noorphan,regent /opt/oxide/wicketd/bin/wicketd run /var/svc/manifest/site/wicketd/config.toml --address %{config/address} --artifact-address %{config/artifact-address} --mgs-address %{config/mgs-address} --nexus-proxy-address %{config/nexus-proxy-address} --baseboard-file %{config/baseboard-file} --read-smf-config &amp;'
     timeout_seconds='0' />
@@ -45,6 +55,11 @@
     <propval name='mgs-address' type='astring' value='unknown' />
     <propval name='nexus-proxy-address' type='astring' value='unknown' />
     <propval name='baseboard-file' type='astring' value='unknown' />
+    <!-- 
+      TODO: Remove this baseboard info and send it to
+      switch_zone_setup service instead?
+    -->
+    <propval name='baseboard-info' type='astring' value='unknown' />
 
     <!--
       In a standard deployment, this will remain `unknown` until rack setup

zone-setup/src/bin/zone-setup.rs

@@ -22,12 +22,14 @@ use uzers::{get_group_by_name, get_user_by_name};
 pub const HOSTS_FILE: &str = "/etc/inet/hosts";
 pub const CHRONY_CONFIG_FILE: &str = "/etc/inet/chrony.conf";
 pub const LOGADM_CONFIG_FILE: &str = "/etc/logadm.d/chrony.logadm.conf";
+pub const WICKET_BASEBOARD_FILE: &str = "/var/svc/manifest/site/wicketd/baseboard.json";
 pub const ROOT: &str = "root";
 pub const SYS: &str = "sys";
 
 pub const COMMON_NW_CMD: &str = "common-networking";
 pub const OPTE_INTERFACE_CMD: &str = "opte-interface";
 pub const CHRONY_SETUP_CMD: &str = "chrony-setup";
+pub const WICKET_SETUP_CMD: &str = "wicket-setup";
 
 fn parse_ip(s: &str) -> anyhow::Result<IpAddr> {
     if s == "unknown" {
@@ -72,6 +74,14 @@ fn parse_chrony_conf(s: &str) -> anyhow::Result<String> {
     s.parse().map_err(|_| anyhow!("ERROR: Invalid chrony configuration file"))
 }
 
+fn parse_wicket_conf(s: &str) -> anyhow::Result<String> {
+    if s == "" {
+        return Err(anyhow!("ERROR: Missing baseboard configuration file"));
+    };
+
+    s.parse().map_err(|_| anyhow!("ERROR: Invalid baseboard configuration file"))
+}
+
 fn parse_boundary(s: &str) -> anyhow::Result<bool> {
     s.parse().map_err(|_| anyhow!("ERROR: Invalid boundary input"))
 }
@@ -113,11 +123,14 @@ async fn do_run() -> Result<(), CmdError> {
                     .value_parser(parse_ipv6),
                 )
                 .arg(
-                    arg!(
-                        -s --static_addr <Ipv6Addr> "static_addr"
-                    )
+                    Arg::new("static_addrs")
+                    .short('s')
+                    .long("static_addrs")
+                    .num_args(1..)
+                    .value_delimiter(' ')
+                    .value_parser(parse_ipv6)
+                    .help("List of static addresses separated by a space")
                     .required(true)
-                    .value_parser(parse_ipv6),
                 ),
         )
         .subcommand(
@@ -145,6 +158,23 @@ async fn do_run() -> Result<(), CmdError> {
                     .value_parser(parse_ip),
                 ),
         )
+        .subcommand(
+            Command::new(WICKET_SETUP_CMD)
+                .about("Sets up Wicket configuration")
+                .arg(
+                    arg!(
+                        -b --baseboard_file <STRING> "baseboard_file"
+                    )
+                    .default_value(WICKET_BASEBOARD_FILE)
+                    .value_parser(parse_wicket_conf),
+                )
+                .arg(
+                    arg!(
+                        -i --baseboard_info <STRING> "baseboard_info"
+                    )
+                    .value_parser(parse_wicket_conf),
+                ),
+        )
         .subcommand(
             Command::new(CHRONY_SETUP_CMD)
                 .about("Sets up Chrony configuration for NTP zone") 
@@ -187,6 +217,42 @@ async fn do_run() -> Result<(), CmdError> {
         chrony_setup(matches, log.clone()).await?;
     }
 
+    if let Some(matches) = matches.subcommand_matches(WICKET_SETUP_CMD) {
+        wicket_setup(matches, log.clone()).await?;
+    }
+
+    Ok(())
+}
+
+async fn wicket_setup(
+    matches: &ArgMatches,
+    log: Logger,
+) -> Result<(), CmdError> {
+    let file: &String = matches.get_one("baseboard_file").unwrap();
+    let info: &String = matches.get_one("baseboard_info").unwrap();
+
+    info!(&log, "Generating baseboard.json file"; "baseboard file" => ?WICKET_BASEBOARD_FILE);
+
+    let mut config_file = OpenOptions::new()
+    .write(true)
+    .create(true)
+    .truncate(true)
+    .open(file)
+    .map_err(|err| {
+        CmdError::Failure(anyhow!(
+            "Could not create baseboard configuration file {}: {}",
+            file,
+            err
+        ))
+    })?;
+config_file.write(info.as_bytes()).map_err(|err| {
+    CmdError::Failure(anyhow!(
+        "Could not write to baseboard configuration file {}: {}",
+        file,
+        err
+    ))
+})?;
+
     Ok(())
 }
 
@@ -417,7 +483,10 @@ async fn common_nw_set_up(
     log: Logger,
 ) -> Result<(), CmdError> {
     let datalink: &String = matches.get_one("datalink").unwrap();
-    let static_addr: &Ipv6Addr = matches.get_one("static_addr").unwrap();
+    let static_addrs = matches
+        .get_many::<Ipv6Addr>("static_addrs")
+        .unwrap()
+        .collect::<Vec<_>>();
     let gateway: Ipv6Addr = *matches.get_one("gateway").unwrap();
     let zonename = zone::current().await.map_err(|err| {
         CmdError::Failure(anyhow!(
@@ -436,26 +505,34 @@ async fn common_nw_set_up(
     Ipadm::set_interface_mtu(&datalink)
         .map_err(|err| CmdError::Failure(anyhow!(err)))?;
 
-    info!(&log, "Ensuring static and auto-configured addresses are set on the IP interface"; "data link" => ?datalink, "static address" => ?static_addr);
-    Ipadm::create_static_and_autoconfigured_addrs(&datalink, static_addr)
-        .map_err(|err| CmdError::Failure(anyhow!(err)))?;
+    for addr in &static_addrs {
+        info!(&log, "Ensuring static and auto-configured addresses are set on the IP interface"; "data link" => ?datalink, "static address" => ?addr);
+        Ipadm::create_static_and_autoconfigured_addrs(&datalink, addr)
+            .map_err(|err| CmdError::Failure(anyhow!(err)))?;
+    }
 
     info!(&log, "Ensuring there is a default route"; "gateway" => ?gateway);
     Route::ensure_default_route_with_gateway(Gateway::Ipv6(gateway))
         .map_err(|err| CmdError::Failure(anyhow!(err)))?;
 
     info!(&log, "Populating hosts file for zone"; "zonename" => ?zonename);
-    write(
-        HOSTS_FILE,
-        format!(
-            r#"
+    let mut hosts_contents = String::from(
+        r#"
 ::1 localhost loghost
 127.0.0.1 localhost loghost
-{static_addr} {zonename}.local {zonename}
+"#,
+    );
+
+    for addr in static_addrs.clone() {
+        let s = format!(
+            r#"{addr} {zonename}.local {zonename}
 "#
-        ),
-    )
-    .map_err(|err| CmdError::Failure(anyhow!(err)))?;
+        );
+        hosts_contents.push_str(s.as_str())
+    }
+
+    write(HOSTS_FILE, hosts_contents)
+        .map_err(|err| CmdError::Failure(anyhow!(err)))?;
 
     Ok(())
 }