Updated Branches: refs/heads/master a1b72d411 -> ad0d31f72
set iaas providers to cartridge Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ad0d31f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ad0d31f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ad0d31f7 Branch: refs/heads/master Commit: ad0d31f72e6758fa96e75fb82a54b9068c9dfed5 Parents: a1b72d4 Author: Nirmal Fernando <[email protected]> Authored: Sat Dec 14 12:22:25 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Sat Dec 14 12:22:25 2013 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/impl/CloudControllerServiceImpl.java | 2 +- .../apache/stratos/cloud/controller/util/CloudControllerUtil.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ad0d31f7/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index af49f78..4a5c921 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -1050,7 +1050,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { if (iaasProvider == null) { String msg = "Invalid Partition - " + partition.toString() + - ". Cause: Iaas Provider is null for: " + provider; + ". Cause: Iaas Provider is null for Provider: " + provider; log.error(msg); throw new InvalidPartitionException(msg); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ad0d31f7/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java index 9d4d5c0..121207a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java @@ -145,6 +145,8 @@ public class CloudControllerUtil { iaasProvider.addProperty(prop.getName(), prop.getValue()); } } + + cartridge.addIaasProvider(iaasProvider); } } }
