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/15 19:33:23 UTC

[1/4] git commit: Removed unused script

Repository: incubator-usergrid
Updated Branches:
  refs/heads/cloudformation-update aca79b63f -> b0d160540


Removed unused script


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6c8a7f55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6c8a7f55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6c8a7f55

Branch: refs/heads/cloudformation-update
Commit: 6c8a7f558061398de3b7f8d91c0be94b6446d727
Parents: aca79b6
Author: Todd Nine <to...@apache.org>
Authored: Tue Oct 14 17:01:45 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Tue Oct 14 17:01:45 2014 -0600

----------------------------------------------------------------------
 .../src/main/dist/init_instance/init_cass.sh    | 70 --------------------
 1 file changed, 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c8a7f55/stack/awscluster/src/main/dist/init_instance/init_cass.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_cass.sh b/stack/awscluster/src/main/dist/init_instance/init_cass.sh
deleted file mode 100644
index 9c6696a..0000000
--- a/stack/awscluster/src/main/dist/init_instance/init_cass.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements.  The ASF licenses this file to You
-#  under the Apache License, Version 2.0 (the "License"); you may not
-#  use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.  For additional information regarding
-#  copyright in this work, please see the NOTICE file in the top level
-#  directory of this distribution.
-#
-
-echo "${HOSTNAME}" > /etc/hostname
-echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
-hostname `cat /etc/hostname`
-
-echo "US/Eastern" > /etc/timezone
-dpkg-reconfigure -f noninteractive tzdata
-
-PKGS="openjdk-7-jdk s3cmd ntp unzip groovy"
-apt-get update
-apt-get -y install ${PKGS}
-
-# Install AWS Java SDK and get it into the Groovy classpath
-curl http://sdk-for-java.amazonwebservices.com/latest/aws-java-sdk.zip > /tmp/aws-sdk-java.zip
-cd /usr/share/
-unzip /tmp/aws-sdk-java.zip 
-mkdir -p /home/ubuntu/.groovy/lib
-cp /usr/share/aws-java-sdk-*/third-party/*/*.jar /home/ubuntu/.groovy/lib
-cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib 
-# except for evil stax
-rm /home/ubuntu/.groovy/lib/stax*
-ln -s /home/ubuntu/.groovy /root/.groovy
-
-# Build environment for Groovy scripts
-. /etc/profile.d/aws-credentials.sh
-. /etc/profile.d/usergrid-env.sh
-
-
-
-# Register as a Cassandra node and wait for enough other servers to join
-cd /usr/share/usergrid/scripts
-
-groovy registry_register.groovy
-groovy wait_for_cassandra.groovy
-
-# Install and stop Cassandra so we can configure it
-cd /etc/apt/sources.list.d
-cat >> cassandra.sources.list << EOF
-deb http://www.apache.org/dist/cassandra/debian 12x main
-EOF
-sudo apt-get update
-sudo apt-get -y install libcap2
-sudo apt-get --force-yes -y install cassandra
-/etc/init.d/cassandra stop
-
-cd /usr/share/usergrid/init_instance
-cd /usr/share/usergrid/scripts
-groovy configure_cassandra.groovy > /etc/cassandra/cassandra.yaml
-
-# Go
-/etc/init.d/cassandra start
-


[2/4] git commit: Changed default time of tomcat node

Posted by to...@apache.org.
Changed default time of tomcat node


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/57737600
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/57737600
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/57737600

Branch: refs/heads/cloudformation-update
Commit: 57737600db6e56e4ada6ee26503fea0bac1c6b40
Parents: 6c8a7f5
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 15 07:58:34 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 15 07:58:34 2014 -0600

----------------------------------------------------------------------
 stack/awscluster/ugcluster-cf.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/57737600/stack/awscluster/ugcluster-cf.json
----------------------------------------------------------------------
diff --git a/stack/awscluster/ugcluster-cf.json b/stack/awscluster/ugcluster-cf.json
index 5b0a87d..efef0f9 100644
--- a/stack/awscluster/ugcluster-cf.json
+++ b/stack/awscluster/ugcluster-cf.json
@@ -32,7 +32,7 @@
         "RestInstanceType": {
             "Description": "Instance type for REST servers",
             "Type": "String",
-            "Default": "m3.large",
+            "Default": "c3.xlarge",
             "AllowedValues": [
                 "m1.small",
                 "m1.medium",
@@ -1434,4 +1434,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}


[4/4] git commit: Added temporary tagging as instances start

Posted by to...@apache.org.
Added temporary tagging as instances start


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b0d16054
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b0d16054
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b0d16054

Branch: refs/heads/cloudformation-update
Commit: b0d1605409b714e13d06d9be1ccdd6dfa919e673
Parents: 6c632f8
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 15 11:08:32 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 15 11:09:50 2014 -0600

----------------------------------------------------------------------
 .../src/main/dist/init_instance/init_db_server.sh         |  7 +++++++
 .../src/main/dist/init_instance/init_es_server.sh         |  6 ++++++
 .../src/main/dist/init_instance/init_graphite_server.sh   |  6 ++++++
 .../src/main/dist/init_instance/init_rest_server.sh       |  9 ++++++++-
 stack/awscluster/src/main/groovy/tag_instance.groovy      | 10 +++++++++-
 5 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_db_server.sh b/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
index a37bb82..a46e7f9 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_db_server.sh
@@ -18,6 +18,9 @@
 #  directory of this distribution.
 #
 
+
+
+
 echo "${HOSTNAME}" > /etc/hostname
 echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
 hostname `cat /etc/hostname`
@@ -49,6 +52,10 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
 rm /home/ubuntu/.groovy/lib/stax*
 ln -s /home/ubuntu/.groovy /root/.groovy
 
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
 cd /usr/share/usergrid/init_instance
 ./install_oraclejdk.sh 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_es_server.sh b/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
index c187cb8..fbe41ab 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_es_server.sh
@@ -18,6 +18,8 @@
 #  directory of this distribution.
 #
 
+
+
 echo "${HOSTNAME}" > /etc/hostname
 echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
 hostname `cat /etc/hostname`
@@ -49,6 +51,10 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
 rm /home/ubuntu/.groovy/lib/stax*
 ln -s /home/ubuntu/.groovy /root/.groovy
 
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
 cd /usr/share/usergrid/init_instance
 ./install_oraclejdk.sh 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh b/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
index a9d74c0..b095f2b 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_graphite_server.sh
@@ -18,6 +18,8 @@
 #  directory of this distribution.
 #
 
+
+
 echo "${HOSTNAME}" > /etc/hostname
 echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
 hostname `cat /etc/hostname`
@@ -49,6 +51,10 @@ cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib
 rm /home/ubuntu/.groovy/lib/stax*
 ln -s /home/ubuntu/.groovy /root/.groovy
 
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
 cd /usr/share/usergrid/init_instance
 ./install_oraclejdk.sh
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
index 96da354..75edc16 100644
--- a/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
+++ b/stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
@@ -18,6 +18,8 @@
 #  directory of this distribution.
 #
 
+
+
 echo "${HOSTNAME}" > /etc/hostname
 echo "127.0.0.1 ${HOSTNAME}" >> /etc/hosts
 hostname `cat /etc/hostname`
@@ -39,6 +41,11 @@ cp /usr/share/aws-java-sdk-*/third-party/*/*.jar /home/ubuntu/.groovy/lib
 cp /usr/share/aws-java-sdk-*/lib/* /home/ubuntu/.groovy/lib 
 ln -s /home/ubuntu/.groovy /root/.groovy
 
+# tag last so we can see in the console so that we know what's running
+cd /usr/share/usergrid/scripts
+groovy tag_instance.groovy BUILD-IN-PROGRESS
+
+
 # Build environment for Groovy scripts
 . /etc/profile.d/aws-credentials.sh
 . /etc/profile.d/usergrid-env.sh
@@ -145,4 +152,4 @@ sh /etc/init.d/tomcat7 start
 
 # tag last so we can see in the console that the script ran to completion
 cd /usr/share/usergrid/scripts
-groovy tag_instance.groovy
\ No newline at end of file
+groovy tag_instance.groovy

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b0d16054/stack/awscluster/src/main/groovy/tag_instance.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/tag_instance.groovy b/stack/awscluster/src/main/groovy/tag_instance.groovy
index 7e5ed84..99d3288 100644
--- a/stack/awscluster/src/main/groovy/tag_instance.groovy
+++ b/stack/awscluster/src/main/groovy/tag_instance.groovy
@@ -32,6 +32,14 @@ String secretKey  = (String)System.getenv().get("AWS_SECRET_KEY")
 String instanceId = (String)System.getenv().get("EC2_INSTANCE_ID")
 String stackName  = (String)System.getenv().get("STACK_NAME")
 
+
+String moreMetaData = ""
+
+if (args.size() == 1 )  {
+    moreMetaData = args[0]
+}
+
+
 def creds = new BasicAWSCredentials(accessKey, secretKey)
 def ec2Client = new AmazonEC2Client(creds)
 
@@ -39,7 +47,7 @@ def resources = new ArrayList()
 resources.add(instanceId)
 
 def tags = new ArrayList()
-def tag = "${stackName}-${type}-${instanceId}"
+def tag = "${stackName}-${type}-${instanceId}${moreMetaData}"
 tags.add(new Tag("Name", tag))
 
 ec2Client.createTags(new CreateTagsRequest(resources, tags))


[3/4] git commit: Updated to ensure yourkit installs correctly

Posted by to...@apache.org.
Updated to ensure yourkit installs correctly

Updated to fix opscenter installation

Updated to fix keyspace creation


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6c632f8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6c632f8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6c632f8a

Branch: refs/heads/cloudformation-update
Commit: 6c632f8ae17968fa7acdf049aba77932933a62d5
Parents: 5773760
Author: Todd Nine <to...@apache.org>
Authored: Wed Oct 15 10:46:06 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Wed Oct 15 10:57:30 2014 -0600

----------------------------------------------------------------------
 stack/awscluster/pom.xml                        |   2 +-
 stack/awscluster/src/main/cql/create_locks.cql  |  24 +-
 .../awscluster/src/main/cql/create_usergrid.cql |  80 +---
 .../main/cql/create_usergrid_applications.cql   | 411 ++-----------------
 .../main/dist/init_instance/create_keyspaces.sh |  24 +-
 .../init_instance/install_opscenter_agent.sh    |   1 +
 .../main/dist/init_instance/install_yourkit.sh  |   6 +-
 .../src/main/groovy/configure_usergrid.groovy   |   4 +-
 8 files changed, 62 insertions(+), 490 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 0c0bd46..84142d7 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>alex-cloudformation</aws.s3.release-bucket>
+        <aws.s3.release-bucket>todd-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/6c632f8a/stack/awscluster/src/main/cql/create_locks.cql
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/cql/create_locks.cql b/stack/awscluster/src/main/cql/create_locks.cql
index a3eec9f..fc1de2a 100644
--- a/stack/awscluster/src/main/cql/create_locks.cql
+++ b/stack/awscluster/src/main/cql/create_locks.cql
@@ -18,27 +18,9 @@
 
 drop keyspace Locks;
 
-create keyspace Locks
-  with placement_strategy = 'NetworkTopologyStrategy'
-  and strategy_options = {us-east : 3}
-  and durable_writes = false;
+create keyspace Locks with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = false;
+update keyspace Locks with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = false;
 
 use Locks;
 
-create column family HLocks
-  with column_type = 'Standard'
-  and comparator = 'UTF8Type'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'UTF8Type'
-  and read_repair_chance = 0.0
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 60
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'ALL'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
+create column family HLocks with gc_grace=60 and caching=ALL and read_repair_chance=0.00 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/cql/create_usergrid.cql
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/cql/create_usergrid.cql b/stack/awscluster/src/main/cql/create_usergrid.cql
index c33a81a..deae504 100644
--- a/stack/awscluster/src/main/cql/create_usergrid.cql
+++ b/stack/awscluster/src/main/cql/create_usergrid.cql
@@ -16,81 +16,13 @@
  * directory of this distribution.
  */
 
-create keyspace Usergrid
-  with placement_strategy = 'NetworkTopologyStrategy'
-  and strategy_options = {us-east : 3}
-  and durable_writes = true;
+create keyspace Usergrid with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
+update keyspace Usergrid with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
 
 use Usergrid;
 
-create column family Applications
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
+create column family Applications with caching=KEYS_ONLY and read_repair_chance=0.1  and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family PrincipalTokens with caching=KEYS_ONLY and read_repair_chance=0.1  and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Properties with caching=KEYS_ONLY and read_repair_chance=0.1  and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Tokens with caching=ALL and read_repair_chance=0.1  and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
 
-create column family PrincipalTokens
-  with column_type = 'Standard'
-  and comparator = 'UUIDType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Properties
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Tokens
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'ALL'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/cql/create_usergrid_applications.cql
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/cql/create_usergrid_applications.cql b/stack/awscluster/src/main/cql/create_usergrid_applications.cql
index 3a80567..bb3d29a 100644
--- a/stack/awscluster/src/main/cql/create_usergrid_applications.cql
+++ b/stack/awscluster/src/main/cql/create_usergrid_applications.cql
@@ -16,393 +16,32 @@
  * directory of this distribution.
  */
 
-create keyspace Usergrid_Applications
-  with placement_strategy = 'NetworkTopologyStrategy'
-  and strategy_options = {us-east : 3}
-  and durable_writes = true;
+create keyspace Usergrid_Applications with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
+update keyspace Usergrid_Applications with placement_strategy = 'NetworkTopologyStrategy' and strategy_options = {KEYSPACE_REGION : 3} and durable_writes = true;
 
 use Usergrid_Applications;
 
-create column family Application_Aggregate_Counters
-  with column_type = 'Standard'
-  and comparator = 'LongType'
-  and default_validation_class = 'CounterColumnType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
+create column family Application_Aggregate_Counters with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Application_Roles with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Applications with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Consumer_Queue_Messages_Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Composite_Dictionaries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Counters with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Dictionaries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Id_Sets with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Index with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Index_Entries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Metadata with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Entity_Unique with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Consumers with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Consumers_Timeout with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Counters with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Property_Index with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family MQ_Property_Index_Entries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Dictionaries with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Inbox with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Properties with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Subscribers with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
+create column family Queue_Subscriptions with caching=KEYS_ONLY and read_repair_chance=0.1 and compaction_strategy='LeveledCompactionStrategy' and bloom_filter_fp_chance=0.1 and compaction_strategy_options={sstable_size_in_mb:512};
 
-create column family Application_Roles
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Applications
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Consumer_Queue_Messages_Properties
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Composite_Dictionaries
-  with column_type = 'Standard'
-  and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
 X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Counters
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'CounterColumnType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Dictionaries
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Id_Sets
-  with column_type = 'Standard'
-  and comparator = 'UUIDType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Index
-  with column_type = 'Standard'
-  and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
 X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Index_Entries
-  with column_type = 'Standard'
-  and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
 X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Metadata
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Properties
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Entity_Unique
-  with column_type = 'Standard'
-  and comparator = 'UUIDType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and bloom_filter_fp_chance = 0.1
-  and compaction_strategy_options = {'sstable_size_in_mb' : '512'}
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Consumers
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Consumers_Timeout
-  with column_type = 'Standard'
-  and comparator = 'UUIDType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Counters
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'CounterColumnType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Property_Index
-  with column_type = 'Standard'
-  and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
 X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family MQ_Property_Index_Entries
-  with column_type = 'Standard'
-  and comparator = 'DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType,A=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.AsciiType),B=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.BytesType),a=>org.apache.cassandra.db.marshal.AsciiType,L=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LongType),l=>org.apache.cassandra.db.marshal.LongType,I=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.IntegerType),i=>org.apache.cassandra.db.marshal.IntegerType,U=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType),T=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.TimeUUIDType),u=>org.apache.cassandra.db.marshal.UUIDType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,s=>org.apache.cassandra.db.marshal.UTF8Type,S=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type),
 X=>org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.LexicalUUIDType),x=>org.apache.cassandra.db.marshal.LexicalUUIDType)'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Dictionaries
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Inbox
-  with column_type = 'Standard'
-  and comparator = 'UUIDType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Properties
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Subscribers
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};
-
-create column family Queue_Subscriptions
-  with column_type = 'Standard'
-  and comparator = 'BytesType'
-  and default_validation_class = 'BytesType'
-  and key_validation_class = 'BytesType'
-  and read_repair_chance = 0.1
-  and dclocal_read_repair_chance = 0.0
-  and populate_io_cache_on_flush = false
-  and gc_grace = 864000
-  and min_compaction_threshold = 4
-  and max_compaction_threshold = 32
-  and replicate_on_write = true
-  and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'
-  and caching = 'KEYS_ONLY'
-  and compression_options = {'sstable_compression' : 'org.apache.cassandra.io.compress.SnappyCompressor'};

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh b/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
index 1151a9f..f2ebe8f 100644
--- a/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
+++ b/stack/awscluster/src/main/dist/init_instance/create_keyspaces.sh
@@ -28,11 +28,27 @@ FIRSTHOST="$(groovy get_first_instance.groovy cassandra)"
 
 if [ "$FIRSTHOST"=="$PUBLIC_HOSTNAME" ]; then
 
-cd /usr/share/usergrid/cql
 
-/usr/bin/cassandra-cli -f  create_locks.cql
-/usr/bin/cassandra-cli -f  create_usergrid.cql
-/usr/bin/cassandra-cli -f  create_usergrid_applications.cql
+#Update the keyspace replication and run the cql
+sed -i.bak "s/KEYSPACE_REGION/${EC2_REGION}/g" /usr/share/usergrid/cql/create_locks.cql
+
+/usr/bin/cassandra-cli -f  /usr/share/usergrid/cql/create_locks.cql
+
+
+
+
+#Update the keyspace region and run the cql
+sed -i.bak "s/KEYSPACE_REGION/${EC2_REGION}/g" /usr/share/usergrid/cql/create_usergrid.cql
+
+/usr/bin/cassandra-cli -f  /usr/share/usergrid/cql/create_usergrid.cql
+
+
+
+
+#Update the keyspace region and run the cql
+sed -i.bak "s/KEYSPACE_REGION/${EC2_REGION}/g" /usr/share/usergrid/cql/create_usergrid_applications.cql
+
+/usr/bin/cassandra-cli -f  /usr/share/usergrid/cql/create_usergrid_applications.cql
 
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh b/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
index 447da6f..17ec780 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_opscenter_agent.sh
@@ -30,6 +30,7 @@ sudo apt-get update
 sudo apt-get install datastax-agent
 
 
+cd /usr/share/usergrid/scripts
 groovy configure_opscenter_agent.groovy > /var/lib/datastax-agent/conf/address.yaml
 
 sudo service datastax-agent start

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh b/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
index 3812612..e117db7 100644
--- a/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
+++ b/stack/awscluster/src/main/dist/init_instance/install_yourkit.sh
@@ -25,15 +25,15 @@ if [[ $YOURKIT = "true" ]]; then
 
 mkdir -p /mnt/yourkit
 cd /mnt/yourkit
-s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/yjp-2014-build-14104.zip
-unzip /mnt/yourkit/yjp-2014-build-14104.zip
+s3cmd --config=/etc/s3cfg get s3://${RELEASE_BUCKET}/yjp-2014-build-14108.zip
+unzip /mnt/yourkit/yjp-2014-build-14108.zip
 
 mkdir -p /mnt/yourkitreports
 
 chown -R tomcat7.tomcat7 /mnt/yourkitreports
 
 cat >> /etc/default/tomcat7 << EOF
-JAVA_OPTS="${JAVA_OPTS} -agentpath:/mnt/yourkit/yjp-2014-build-14104/bin/linux-x86-64/libyjpagent.so=port=10001,logdir=/mnt/yourkitreports,dir=/mnt/yourkitreports,onexit=snapshot"
+JAVA_OPTS="${JAVA_OPTS} -agentpath:/mnt/yourkit/yjp-2014-build-14108/bin/linux-x86-64/libyjpagent.so=port=10001,logdir=/mnt/yourkitreports,dir=/mnt/yourkitreports,onexit=snapshot"
 EOF
 
 fi

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6c632f8a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
----------------------------------------------------------------------
diff --git a/stack/awscluster/src/main/groovy/configure_usergrid.groovy b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
index a0a051c..03b3077 100644
--- a/stack/awscluster/src/main/groovy/configure_usergrid.groovy
+++ b/stack/awscluster/src/main/groovy/configure_usergrid.groovy
@@ -43,6 +43,8 @@ def testAdminUserEmail = System.getenv().get("TEST_ADMIN_USER_EMAIL")
 def cassThreads = System.getenv().get("TOMCAT_THREADS")
 def hystrixThreads = Integer.parseInt(cassThreads) / 100
 
+def ec2Region = System.getenv().get("EC2_REGION")
+
 
 NodeRegistry registry = new NodeRegistry();
 
@@ -81,7 +83,7 @@ def usergridConfig = """
 cassandra.url=${cassandras}
 cassandra.cluster=${clusterName}
 cassandra.keyspace.strategy=org.apache.cassandra.locator.SimpleStrategy
-cassandra.keyspace.replication=${replFactor}
+cassandra.keyspace.replication=${ec2Region}:${replFactor}
 
 cassandra.timeout=5000
 cassandra.connections=${cassThreads}