Skip to content
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

Pre-check bundle should be optional also for 4.1.1 and beyond #1454

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Pre-check bundle should be optional also for 4.1.1 and beyond #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions nsxt/resource_nsxt_upgrade_prepare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func uploadPrecheckAndUpgradeBundle(d *schema.ResourceData, m interface{}) error
precheckBundleType := nsxModel.UpgradeBundleFetchRequest_BUNDLE_TYPE_PRE_UPGRADE
precheckBundleURL := d.Get("precheck_bundle_url").(string)
if !precheckBundleCompatibilityCheck(precheckBundleURL) {
return fmt.Errorf("Precheck bundle is only supported and is required for NSXT version >= 4.1.1")
return fmt.Errorf("Precheck bundle is only supported for NSXT version >= 4.1.1")
}
if len(precheckBundleURL) > 0 {
err := uploadUpgradeBundle(d, m, precheckBundleType)
Expand All @@ -292,9 +292,6 @@ func precheckBundleCompatibilityCheck(precheckBundleURL string) bool {
if util.NsxVersionLower("4.1.1") && len(precheckBundleURL) > 0 {
return false
}
if util.NsxVersionHigherOrEqual("4.1.1") && len(precheckBundleURL) == 0 {
return false
}
return true
}

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/upgrade_prepare.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The following arguments are supported:

* `upgrade_bundle_url` - (Required) The url to download the Manager Upgrade bundle.
* `version` - (Optional) Target upgrade version for NSX, format is x.x.x..., should include at least 3 digits, example: 4.1.2
* `precheck_bundle_url` - (Optional) The url to download the Precheck bundle. This field is required if NSX >= 4.1.1
* `precheck_bundle_url` - (Optional) The url to download the Precheck bundle.
* `accept_user_agreement` - (Required) This field must be set to true otherwise upgrade will not proceed.
* `bundle_upload_timeout` - (Optional) Timeout for uploading upgrade bundle in seconds. Default is `3600`.
* `uc_upgrade_timeout` - (Optional) Timeout for upgrading upgrade coordinator in seconds. Default is `1800`.
Expand Down
Loading