Skip to content

UI: fix userdataid or userdata content is passed when userdata append or override is unchecked #7758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weizhouapache merged 2 commits into from
Jul 25, 2023
Merged

UI: fix userdataid or userdata content is passed when userdata append or override is unchecked #7758

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7dc17f
UI: fix userdataid or userdata content is passed when userdata append…
weizhouapache Jul 20, 2023
dc6bde6
Merge branch '4.18' into 4.18-fix-deployvm-userdataid
weizhouapache Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ui/src/views/compute/DeployVM.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,8 @@ export default {
deployVmData.dynamicscalingenabled = values.dynamicscalingenabled
deployVmData.iothreadsenabled = values.iothreadsenabled
deployVmData.iodriverpolicy = values.iodriverpolicy
if (values.userdata && values.userdata.length > 0) {
const isUserdataAllowed = !this.userdataDefaultOverridePolicy || (this.userdataDefaultOverridePolicy === 'ALLOWOVERRIDE' && this.doUserdataOverride) || (this.userdataDefaultOverridePolicy === 'APPEND' && this.doUserdataAppend)
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Jul 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be a boolean method

if (isUserdataAllowed && values.userdata && values.userdata.length > 0) {
deployVmData.userdata = encodeURIComponent(btoa(sanitizeReverse(values.userdata)))
}
// step 2: select template/iso
Expand Down Expand Up @@ -2093,7 +2094,9 @@ export default {
}
// step 7: select ssh key pair
deployVmData.keypairs = this.sshKeyPairs.join(',')
deployVmData.userdataid = values.userdataid
if (isUserdataAllowed) {
deployVmData.userdataid = values.userdataid
}

if (values.name) {
deployVmData.name = values.name
Expand Down Expand Up @@ -2129,7 +2132,7 @@ export default {
idx++
}
}
if (this.userDataValues) {
if (isUserdataAllowed && this.userDataValues) {
for (const [key, value] of Object.entries(this.userDataValues)) {
deployVmData['userdatadetails[' + idx + '].' + `${key}`] = value
idx++
Expand Down