From 9dc85d649f88f2cac9e1873ce9c019a5d3664e69 Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <andy@oxidecomputer.com>
Date: Sun, 10 Mar 2024 22:18:51 +0000
Subject: [PATCH] oxide/opte-interface-setup should default to disabled (#5230)

The `oxide/opte-interface-setup` service is present in all NTP zones,
but only the boundary zones require an OPTE interface. sled-agent
explicitly enables the service for just the boundary zones, but because
the service is enabled by default it ends up attempting to start in the
non-boundaries too, where it fails.

```
[ Mar  8 12:56:26 Executing start method ("/opt/oxide/zone-network-cli/bin/zone-networking opte-interface-set-up -i unknown -g unknown -p unknown"). ]
note: configured to log to "/dev/stderr"
error: invalid value 'unknown' for '--opte_interface <STRING>': ERROR: Missing OPTE interface

For more information, try '--help'.
[ Mar  8 12:56:26 Method "start" exited with status 2. ]
```
---
 smf/opte-interface-setup/manifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smf/opte-interface-setup/manifest.xml b/smf/opte-interface-setup/manifest.xml
index 5b886c8a71..68641f56fc 100644
--- a/smf/opte-interface-setup/manifest.xml
+++ b/smf/opte-interface-setup/manifest.xml
@@ -4,7 +4,7 @@
 <service_bundle type='manifest' name='opte-interface-setup'>
 
 <service name='oxide/opte-interface-setup' type='service' version='1'>
-  <create_default_instance enabled='true' />
+  <create_default_instance enabled='false' />
 
   <!-- Run after the operating system's svc:/network/physical service is done. -->
   <dependency name='physical' grouping='require_all' restart_on='none'
@@ -20,7 +20,7 @@
   <exec_method type='method' name='start'
     exec='/opt/oxide/zone-network-cli/bin/zone-networking opte-interface-set-up -i %{config/interface} -g %{config/gateway} -p %{config/ip}'
     timeout_seconds='0' />
-  
+
   <property_group name='startd' type='framework'>
     <propval name='duration' type='astring' value='transient' />
   </property_group>
@@ -35,7 +35,7 @@
 
   <template>
     <common_name>
-      <loctext xml:lang='C'>Oxide OPTE interface set up</loctext>
+      <loctext xml:lang='C'>Oxide OPTE interface setup</loctext>
     </common_name>
     <description>
       <loctext xml:lang='C'>Sets up an OPTE interface for control plane zones that require it</loctext>