Skip to content

Conversation

@karencfv
Copy link

@karencfv karencfv commented May 2, 2024

DO NOT MERGE - let's wait until release 8 is out the door

In Omicron, we are converting all zones to be self assembling. This means we are no longer having to boot the zone, configure zone networking, configure all the services and finally refresh each service.

For the switch zone we have two new services that configure common zone networking in oxidecomputer/omicron#5593. This PR adds these dependencies to the SMF files that require them, and sets the service default instance as enabled by default.

This PR should be merged in conjunction with oxidecomputer/omicron#5593

@karencfv
Copy link
Author

karencfv commented May 2, 2024

Hmm, this test failure seems unrelated to my changes I think

error: you are using an explicit closure for cloning elements
   --> lldpd/src/interfaces.rs:146:5
    |
146 | /     g.interfaces
147 | |         .lock()
148 | |         .unwrap()
149 | |         .get(iface)
150 | |         .ok_or(LldpdError::Missing(format!("no such interface: {iface}")))
151 | |         .map(|i| i.clone())
    | |___________________________^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#map_clone
    = note: `-D clippy::map-clone` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::map_clone)]`
help: consider calling the dedicated `cloned` method
    |
146 ~     g.interfaces
147 +         .lock()
148 +         .unwrap()
149 +         .get(iface)
150 +         .ok_or(LldpdError::Missing(format!("no such interface: {iface}"))).cloned()
    |

error: could not compile `lldpd` (bin "lldpd") due to 1 previous error

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants