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.

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

B-518: Fix state LOCKED not supported while creating marketplace app #519

Merged
merged 1 commit into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FEATURES:

* **New Resource**: `opennebula_marketplace` (#414)
* **New Data Source**: `opennebula_marketplace` (#414)
* **New Resource**: `opennebula_marketplace_appliance` (#476)
* **New Resource**: `opennebula_marketplace_appliance` (#476, #518)
* **New Data Source**: `opennebula_marketplace_appliance` (#476)
* resources/opennebula_virtual_router_nic: add floating IP allocation (#510)

Expand Down Expand Up @@ -412,7 +412,8 @@ DEPRECATION:

FEATURES:

* **New Resource**** New Data Source**: opennebula_user : First implementation ([#69](https://github.com/OpenNebula/terraform-provider-opennebula/issues/69))
* **New Resource**: opennebula_user : First implementation ([#69](https://github.com/OpenNebula/terraform-provider-opennebula/issues/69))
* **New Data Source**: opennebula_user : First implementation ([#69](https://github.com/OpenNebula/terraform-provider-opennebula/issues/69))
* resources/opennebula_virtual_machine: Enable VM disk update ([#64](https://github.com/OpenNebula/terraform-provider-opennebula/issues/64))
* resources/opennebula_virtual_machine: Change 'image_id' disk attribute from Required to Optional ([#71](https://github.com/OpenNebula/terraform-provider-opennebula/issues/71))
* **New Resource**: `opennebula_service`: First implementation ([oneflow](http://docs.opennebula.io/5.12/integration/system_interfaces/appflow_api.html#service)),
Expand Down
2 changes: 1 addition & 1 deletion opennebula/resource_opennebula_marketplace_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func resourceOpennebulaMarketPlaceAppCreate(ctx context.Context, d *schema.Resou
ac := controller.MarketPlaceApp(appID)

timeout := d.Timeout(schema.TimeoutCreate)
_, err = waitForMarketAppStates(ctx, ac, timeout, []string{app.Init.String(), app.Ready.String()}, []string{app.Ready.String()})
_, err = waitForMarketAppStates(ctx, ac, timeout, []string{app.Init.String(), app.Ready.String(), app.Locked.String()}, []string{app.Ready.String()})
if err != nil {
diags = append(diags, diag.Diagnostic{
Severity: diag.Error,
Expand Down
Loading