[smf] Use new zone network config service (#1096)

oxidecomputer/omicron#4677 implements a new zone network configuration setup service so control plane services don't have to set this up themselves. This PR updates crucible to use said services.
oxidecomputer · Feb 20, 2024 · fe0c5c7 · fe0c5c7
1 parent 3d48060
commit fe0c5c7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 85 deletions.
diff --git a/agent/agent_method_script.sh b/agent/agent_method_script.sh
diff --git a/agent/smf/agent.xml b/agent/smf/agent.xml
@@ -13,8 +13,13 @@
     <service_fmri value='svc:/milestone/multi-user' />
   </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/lib/svc/manifest/crucible/agent.sh'
+    exec='/opt/oxide/crucible/bin/crucible-agent run -D /opt/oxide/crucible/bin/crucible-downstairs --dataset %{config/dataset} -l [%{config/listen_addr}]:%{config/listen_port} -P %{config/portbase} -p %{config/downstairs_prefix} -s %{config/snapshot_prefix}'
     timeout_seconds='30'
     />
 
@@ -25,11 +30,10 @@
   </property_group>
 
   <property_group name='config' type='application'>
-    <propval name='datalink' type='astring' value='unknown' />
-    <propval name='gateway' type='astring' value='unknown' />
     <propval name='dataset' type='astring' value='' />
     <propval name='listen_addr' type='astring' value='127.0.0.1' />
     <propval name='listen_port' type='astring' value='17000' />
+    <!-- TODO: Are 'uuid' and 'nexus' being used? -->
     <propval name='uuid' type='astring' value='' />
     <propval name='nexus' type='astring' value='127.0.0.1:12221' />
     <propval name='portbase' type='astring' value='19000' />

diff --git a/package-manifest.toml b/package-manifest.toml
@@ -6,7 +6,6 @@ source.rust.release = true
 source.paths = [
   { from = "agent/smf", to = "/var/svc/manifest/site/crucible" },
   { from = "agent/downstairs_method_script.sh", to = "/opt/oxide/lib/svc/manifest/crucible/downstairs.sh" },
-  { from = "agent/agent_method_script.sh", to = "/opt/oxide/lib/svc/manifest/crucible/agent.sh" }
 ]
 output.type = "zone"
 
@@ -17,6 +16,5 @@ source.rust.binary_names = ["crucible-pantry"]
 source.rust.release = true
 source.paths = [
   { from = "pantry/smf/pantry.xml", to = "/var/svc/manifest/site/crucible/pantry.xml" },
-  { from = "pantry/pantry_method_script.sh", to = "/opt/oxide/lib/svc/manifest/crucible/pantry.sh" }
 ]
 output.type = "zone"
diff --git a/pantry/pantry_method_script.sh b/pantry/pantry_method_script.sh
diff --git a/pantry/smf/pantry.xml b/pantry/smf/pantry.xml
@@ -13,8 +13,13 @@
     <service_fmri value='svc:/milestone/multi-user' />
   </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/lib/svc/manifest/crucible/pantry.sh'
+    exec='/opt/oxide/pantry/bin/crucible-pantry run -l [%{config/listen_addr}]:%{config/listen_port}'
     timeout_seconds='30'
     />
 
@@ -25,8 +30,6 @@
   </property_group>
 
   <property_group name='config' type='application'>
-    <propval name='datalink' type='astring' value='unknown' />
-    <propval name='gateway' type='astring' value='unknown' />
     <propval name='listen_addr' type='astring' value='127.0.0.1' />
     <propval name='listen_port' type='astring' value='17000' />
   </property_group>