Skip to content

Commit

Permalink
oxide/opte-interface-setup should default to disabled (#5230)
Browse files Browse the repository at this point in the history
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. ]
```
  • Loading branch information
citrus-it authored Mar 10, 2024
1 parent 1eaad08 commit 9dc85d6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions smf/opte-interface-setup/manifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 9dc85d6

Please sign in to comment.