Updated Branches: refs/heads/master f573c2083 -> ba3b50c32
fixing key pair setting method in Openstack IaaS Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/39bc10fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/39bc10fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/39bc10fe Branch: refs/heads/master Commit: 39bc10fe1397a0ffe48dfaabebf27eaa3841d28d Parents: f573c20 Author: Nirmal Fernando <[email protected]> Authored: Tue Dec 10 21:16:32 2013 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Dec 10 21:16:32 2013 +0530 ---------------------------------------------------------------------- .../cloud/controller/iaases/AWSEC2Iaas.java | 10 -------- .../controller/iaases/OpenstackNovaIaas.java | 26 +++----------------- 2 files changed, 3 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/39bc10fe/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java index 92d4cd6..c6375d2 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java @@ -146,16 +146,6 @@ public class AWSEC2Iaas extends Iaas { } - /*if (iaas.getProperty(CloudControllerConstants.PAYLOAD_FOLDER) != null) { - template.getOptions() - .as(AWSEC2TemplateOptions.class) - .userData( - ComputeServiceBuilderUtil.getUserData(CarbonUtils - .getCarbonHome() - + File.separator - + iaas.getProperty(CloudControllerConstants.PAYLOAD_FOLDER))); - }*/ - if (iaas.getProperty(CloudControllerConstants.KEY_PAIR) != null) { template.getOptions().as(AWSEC2TemplateOptions.class) .keyPair(iaas.getProperty(CloudControllerConstants.KEY_PAIR)); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/39bc10fe/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java index 070c356..260571a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java @@ -79,12 +79,6 @@ public class OpenstackNovaIaas extends Iaas { + iaas.getName()); } - // // if domain to template map is null - // if (entity.getDomainToTemplateMap() == null) { - // // we initialize it - // entity.setDomainToTemplateMap(new HashMap<String, Template>()); - // } - TemplateBuilder templateBuilder = iaas.getComputeService() .templateBuilder(); templateBuilder.imageId(iaas.getImage()); @@ -92,12 +86,8 @@ public class OpenstackNovaIaas extends Iaas { templateBuilder.locationId(iaas.getType()); } - // to avoid creation of template objects in each and every time, we - // create all - // at once! - // for (org.apache.cartridge.autoscaler.service.util.ServiceContext temp - // : - // serviceContexts) { + // to avoid creation of template objects in each and every time, we + // create all at once! String instanceType; @@ -131,19 +121,9 @@ public class OpenstackNovaIaas extends Iaas { CloudControllerConstants.ENTRY_SEPARATOR)); } - /*if (iaas.getProperty(CloudControllerConstants.PAYLOAD_FOLDER) != null) { - template.getOptions() - .as(NovaTemplateOptions.class) - .userData( - ComputeServiceBuilderUtil.getUserData(CarbonUtils - .getCarbonHome() - + File.separator - + iaas.getProperty(CloudControllerConstants.PAYLOAD_FOLDER))); - } -*/ if (iaas.getProperty(CloudControllerConstants.KEY_PAIR) != null) { template.getOptions().as(NovaTemplateOptions.class) - .keyPairName(CloudControllerConstants.KEY_PAIR); + .keyPairName(iaas.getProperty(CloudControllerConstants.KEY_PAIR)); } //TODO
