fix(xo-web/new-vm): don't send default networkConfig (#5923)

Fixes #5918
This commit is contained in:
Julien Fontanet
2021-09-30 09:37:12 +02:00
committed by GitHub
parent f53ec8968b
commit 0e8f314dd6
2 changed files with 2 additions and 1 deletions

View File

@@ -19,6 +19,7 @@
- [SSH keys] Allow SSH key to be broken anywhere to avoid breaking page formatting (Thanks @tstivers1990!) [#5891](https://github.com/vatesfr/xen-orchestra/issues/5891) (PR [#5892](https://github.com/vatesfr/xen-orchestra/pull/5892))
- [Netbox] Handle nested prefixes by always assigning an IP to the smallest prefix it matches (PR [#5908](https://github.com/vatesfr/xen-orchestra/pull/5908))
- [Netbox] Better handling and error messages when encountering issues due to UUID custom field not being configured correctly [#5905](https://github.com/vatesfr/xen-orchestra/issues/5905) [#5806](https://github.com/vatesfr/xen-orchestra/issues/5806) [#5834](https://github.com/vatesfr/xen-orchestra/issues/5834) (PR [#5909](https://github.com/vatesfr/xen-orchestra/pull/5909))
- [New VM] Don't send network config if untouched as all commented config can make Cloud-init fail [#5918](https://github.com/vatesfr/xen-orchestra/issues/5918) (PR [#5923](https://github.com/vatesfr/xen-orchestra/pull/5923))
### Packages to release

View File

@@ -397,7 +397,7 @@ export default class NewVm extends BaseComponent {
const seqStart = state.seqStart
cloudConfigs = map(state.nameLabels, (_, i) => replacer(state, i + +seqStart))
}
networkConfig = defined(state.networkConfig, DEFAULT_NETWORK_CONFIG_TEMPLATE)
networkConfig = state.networkConfig
}
} else if (this._isCoreOs()) {
cloudConfig = state.cloudConfig