You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/03/26 06:45:23 UTC
stratos git commit: fixing not picking region in Openstack when
terminating instances
Repository: stratos
Updated Branches:
refs/heads/master bc966bad5 -> 98d9cade1
fixing not picking region in Openstack when terminating instances
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/98d9cade
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/98d9cade
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/98d9cade
Branch: refs/heads/master
Commit: 98d9cade122e302665450b437593cee7be28c563
Parents: bc966ba
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Mar 26 11:14:39 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Mar 26 11:14:39 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/services/impl/InstanceTerminator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/98d9cade/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
index fdd6b29..968cb9e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/InstanceTerminator.java
@@ -21,7 +21,6 @@ package org.apache.stratos.cloud.controller.services.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.config.CloudControllerConfig;
import org.apache.stratos.cloud.controller.context.CloudControllerContext;
import org.apache.stratos.cloud.controller.domain.IaasProvider;
import org.apache.stratos.cloud.controller.domain.MemberContext;
@@ -42,9 +41,10 @@ public class InstanceTerminator implements Runnable {
public InstanceTerminator(MemberContext memberContext) {
String provider = memberContext.getPartition().getProvider();
- IaasProvider iaasProvider = CloudControllerConfig.getInstance().getIaasProvider(provider);
+ IaasProvider iaasProvider = CloudControllerContext.getInstance().getIaasProvider(memberContext.getCartridgeType(), provider);
this.iaas = iaasProvider.getIaas();
this.memberContext = memberContext;
+
}
@Override