Explicitly set bootstrap flag #327
Conversation
masnax
requested review from
tomponline,
roosterfish and
markylaing
as code owners
cmd/microcloud/ask.go
Outdated
| @@ -148,8 +148,7 @@ func (c *CmdControl) askAddress(autoSetup bool, listenAddr string) (string, *net | |||
| return listenAddr, iface, subnet, nil | |||
| } | |||
|
|
|||
| func (c *CmdControl) askDisks(sh *service.Handler, systems map[string]InitSystem, autoSetup bool, wipeAllDisks bool) error { | |||
| _, bootstrap := systems[sh.Name] | |||
| func (c *CmdControl) askDisks(sh *service.Handler, systems map[string]InitSystem, autoSetup bool, wipeAllDisks bool, bootstrap bool) error { | |||
There was a problem hiding this comment.
This is totally a nit, but the sum of these two/three (autoSetup and bootstrap (and wipeAllDisks)) seems like it's being passed around a lot here. It would be more readable at the call site if this were factored into some kind of AskFlags structure.
There was a problem hiding this comment.
Yeah, that's true. A lot of this config (even the systems map) should probably be part of the receiver of these methods.
There was a problem hiding this comment.
I've added 2 commits here (though it might not be the best place for it) to add a new initConfig struct.
This holds all the arguments that are passed to every helper, so that they can all be receivers of that type and access the fields.
There was a problem hiding this comment.
Thanks, this looks better.
masnax
force-pushed
the
ovn-reorg
branch
3 times, most recently
from
69ff3a8
to
8c5033e
Compare
Relying on the system map having the local entry to determine if we need to bootstrap is not always accurate. So instead we can just set what we expect given the command we are running. The exception is the preseed case where the system map is not modified from what is supplied by the preseed. Signed-off-by: Max Asnaashari <[email protected]>
It was a bit weird that we generate a FAN network and then overwrite it. Especially now that we need to check existing cluster members, this is a bit more expensive. So this refactors askNetwork into two helpers: askOVNNetwork which sets up the OVN network, then if no network is created by that helper, we fallback to the FAN implementation. Signed-off-by: Max Asnaashari <[email protected]>
Signed-off-by: Max Asnaashari <[email protected]>
Signed-off-by: Max Asnaashari <[email protected]>
Signed-off-by: Max Asnaashari <[email protected]>
We often infer whether or not we are bootstrapping by checking the
systemsmap for the local system. However now that we can re-use clusters from existing systems, we can't always rely on the local member being the bootstrapper.Instead, this PR explicitly sets whether or not we are bootstrapping based on the command we are running.
Additionally, there is a commit that cleans up the network questions. Before, we used to apply the FAN network first and then overwrite it with the OVN network. This is a bit inefficient and will break with adding services (#260) so this PR splits the network questions into two functions. First we try to create the OVN network (or return nil). Then if weren't able to do that, we try to create the FAN network.