You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/10/04 17:29:31 UTC
[1/2] git commit: fixing
https://issues.apache.org/jira/browse/STRATOS-87
Updated Branches:
refs/heads/master 70e5492c2 -> 8476a3cba
fixing https://issues.apache.org/jira/browse/STRATOS-87
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8f52a202
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8f52a202
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8f52a202
Branch: refs/heads/master
Commit: 8f52a20254f498e570a2112bd8aa16f1551ee2c1
Parents: a4d7a07
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Oct 4 17:19:14 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Oct 4 17:19:14 2013 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/iaases/AWSEC2Iaas.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8f52a202/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 7a31a45..ff12fe8 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
@@ -112,6 +112,7 @@ public class AWSEC2Iaas extends Iaas {
.placementGroup(iaas.getProperty("availabilityZone"));
}
+ // security group names
if (iaas.getProperty("securityGroups") != null) {
template.getOptions()
.as(AWSEC2TemplateOptions.class)
@@ -121,6 +122,16 @@ public class AWSEC2Iaas extends Iaas {
}
+ // security group ids
+ if (iaas.getProperty("securityGroupIds") != null) {
+ template.getOptions()
+ .as(AWSEC2TemplateOptions.class)
+ .securityGroupIds(iaas.getProperty("securityGroupIds")
+ .split(CloudControllerConstants.ENTRY_SEPARATOR));
+
+ }
+
+
if (iaas.getProperty(CloudControllerConstants.PAYLOAD_FOLDER) != null) {
template.getOptions()
.as(AWSEC2TemplateOptions.class)
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8476a3cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8476a3cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8476a3cb
Branch: refs/heads/master
Commit: 8476a3cbac9713134adb19b33303e58bc7bf1a27
Parents: 8f52a20 70e5492
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Oct 4 20:58:21 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Oct 4 20:58:21 2013 +0530
----------------------------------------------------------------------
.gitignore | 4 ++++
.../modules/distribution/src/main/assembly/bin.xml | 5 +++++
.../modules/distribution/src/main/conf/jndi.properties | 3 +++
.../modules/distribution/src/main/resources/stratos.bat | 2 +-
.../modules/distribution/src/main/resources/stratos.sh | 1 +
products/elb/modules/distribution/src/main/assembly/bin.xml | 5 +++++
products/elb/modules/distribution/src/main/bin/stratos.bat | 2 +-
products/elb/modules/distribution/src/main/bin/stratos.sh | 1 +
products/elb/modules/distribution/src/main/conf/jndi.properties | 3 +++
products/stratos-controller/conf/jndi.properties | 3 +++
.../stratos-controller/modules/distribution/src/bin/stratos.bat | 2 +-
.../stratos-controller/modules/distribution/src/bin/stratos.sh | 1 +
12 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------