Merge pull request #15184 from gbraad/change-config-order

Fixes #15154 Change order when config and connections are written
This commit is contained in:
openshift-ci[bot]
2022-08-05 08:07:45 +00:00
committed by GitHub

View File

@@ -364,14 +364,6 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
return false, err
}
if err := v.writeConfig(); err != nil {
return false, err
}
if err := setupConnections(v, opts, sshDir); err != nil {
return false, err
}
dist, err := provisionWSLDist(v)
if err != nil {
return false, err
@@ -393,6 +385,14 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
// Cycle so that user change goes into effect
_ = terminateDist(dist)
if err := v.writeConfig(); err != nil {
return false, err
}
if err := setupConnections(v, opts, sshDir); err != nil {
return false, err
}
return true, nil
}