You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/17 18:35:02 UTC
[15/49] git commit: more cloudformation updates
more cloudformation updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f3fddfe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f3fddfe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f3fddfe9
Branch: refs/heads/two-dot-o
Commit: f3fddfe98cee88a8c1f7ef0eb87a069b7de93954
Parents: 7f731fb
Author: amuramoto <am...@apigee.com>
Authored: Sat Oct 11 01:16:16 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Sat Oct 11 01:16:16 2014 -0700
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
.../dist/init_instance/install_cassandra.sh | 2 +-
stack/awscluster/ugcluster-cf.json | 56 ++++++++++++++++++++
3 files changed, 58 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f3fddfe9/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 049415d..0c0bd46 100644
--- a/stack/awscluster/pom.xml
+++ b/stack/awscluster/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>ug-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>alex-cloudformation</aws.s3.release-bucket>
<stack.war>../rest/target/ROOT.war</stack.war>
<portal.dir>../../portal/dist/usergrid-portal</portal.dir>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f3fddfe9/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
index 9e74348..280ae40 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_cassandra.sh
@@ -28,7 +28,7 @@ deb http://www.apache.org/dist/cassandra/debian 12x main
EOF
apt-get update
-apt-get -y --force-yes install libcap2 cassandra=1.2.11
+apt-get -y --force-yes install libcap2 cassandra=1.2.19
/etc/init.d/cassandra stop
mkdir -p /mnt/data/cassandra
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f3fddfe9/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 31950a2..197eb6c 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -1207,6 +1207,20 @@
}
}
},
+ "AllowRestToESOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "ESSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "RestSecurityGroup"
+ }
+ }
+ },
"CassSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
@@ -1235,6 +1249,34 @@
}
}
},
+ "AllowESToCassOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "CassSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
+ "AllowESToESOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "ESSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "1",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
"AllowRestToCassOnAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {
@@ -1263,6 +1305,20 @@
}
}
},
+ "AllowESToRestOnAllPorts": {
+ "Type": "AWS::EC2::SecurityGroupIngress",
+ "Properties": {
+ "GroupName": {
+ "Ref": "RestSecurityGroup"
+ },
+ "IpProtocol": "tcp",
+ "FromPort": "0",
+ "ToPort": "65535",
+ "SourceSecurityGroupName": {
+ "Ref": "ESSecurityGroup"
+ }
+ }
+ },
"AllowCassToCassOnAllPorts": {
"Type": "AWS::EC2::SecurityGroupIngress",
"Properties": {