From: Steve Smokowski <ss835w@att.com>
Date: Mon, 30 Mar 2020 12:43:56 +0000 (+0000)
Subject: Merge "convert openstack to external tasks"
X-Git-Tag: 1.7.1~260
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=df5f83eef26b23a5381e134ff50f89b340376596;p=so.git

Merge "convert openstack to external tasks"
---

df5f83eef26b23a5381e134ff50f89b340376596
diff --cc adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
index f495015261,3a2d3bc5eb..5951fda16e
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
@@@ -1048,11 -1087,12 +1085,12 @@@ public class MsoVnfAdapterImpl implemen
                  }
                  if (msoHeatUtils != null) {
                      heatStack = msoHeatUtils.createStack(cloudSiteId, cloudOwner, tenantId, vfModuleName, null,
-                             template, goldenInputs, true, heatTemplate.getTimeoutMinutes(), newEnvironmentString,
-                             nestedTemplatesChecked, heatFilesObjects, backout.booleanValue(), failIfExists);
+                             template, goldenInputs, pollForCompletion, heatTemplate.getTimeoutMinutes(),
+                             newEnvironmentString, nestedTemplatesChecked, heatFilesObjects, backout.booleanValue(),
+                             failIfExists);
                      if (msoRequest.getRequestId() != null) {
                          msoHeatUtils.updateResourceStatus(msoRequest.getRequestId(),
 -                                heatStack.isOperationPerformed() ? VF_EXIST_STATUS_MESSAGE : VF_CREATED_STATUS_MESSAGE);
 +                                heatStack.isOperationPerformed() ? VF_CREATED_STATUS_MESSAGE : VF_EXIST_STATUS_MESSAGE);
                      }
                  } else {
                      throw new MsoHeatNotFoundException();