Merge lp:~james-page/charms/oneiric/cassandra/10x-plus-updates into lp:charms/oneiric/cassandra

[James Page]

This update includes

1) General Housekeeping

Added README.rst, used int and boolean types in config.yaml where appropriate.

2) Update to 10x of Cassandra

Since this charm was originally written 1.0.x of Cassandra has been released
and is now considered the stable branch.

No changes where required other than to point at the 10x apt repository.

[Juan L. Negron (negronjl)]

Thanks James!!!

+1 from me

-Juan

[Juan L. Negron (negronjl)]

review: Approve

=== added file 'README.rst'
--- README.rst	1970-01-01 00:00:00 +0000
+++ README.rst	2012-03-09 22:39:20 +0000
@@ -0,0 +1,72 @@
+Overview
+--------
+
+The Apache Cassandra database is the right choice when you need scalability
+and high availability without compromising performance. Linear scalability
+and proven fault-tolerance on commodity hardware or cloud infrastructure
+make it the perfect platform for mission-critical data. Cassandra's support
+for replicating across multiple datacenters is best-in-class, providing lower
+latency for your users and the peace of mind of knowing that you can survive
+regional outages.
+
+Cassandra's ColumnFamily data model offers the convenience of column indexes
+with the performance of log-structured updates, strong support for materialized
+views, and powerful built-in caching.
+
+See http://cassandra.apache.org for more information.
+
+Usage
+-----
+
+Cassandra deployments are relatively simple in that they consist of a set of
+Cassandra nodes which seed from each other to create a ring of servers::
+
+    juju deploy --repository . local:cassandra
+    juju add-unit -n 2 cassandra
+
+The service units will deploy and will form a single ring.
+
+The API to Cassandra is supported through Apache Thrift; Thrift is a software
+framework for scalable cross-language services development.
+
+See http://wiki.apache.org/cassandra/ThriftInterface for more details of how
+to use this API.
+
+Cassandra recommend using one of the many client options - see
+http://wiki.apache.org/cassandra/ClientOptions for moe details
+
+To relate the Cassandra charm to a service that understands how to talk to
+Cassandra using thrift::
+
+    juju deploy --repository . local:service-that-needs-cassandra
+    juju add-relation service-that-needs-cassandra cassandra
+
+Configuration
+-------------
+
+Cassandra has a pretty good guess at configuring its Java memory settings to
+fit the machine that it has been deployed on.
+
+The charm does support manual configuration of Java memory settings - see the
+config.yaml file for more details::
+
+    cassandra:
+        auto-memory: false
+        heap-size: 8G
+        new-gen-size: 250M
+
+However be aware that its recommended that Cassandra always remains in 'real'
+memory and should never be swapped out to disk so keep this in mind when
+changing these options.
+
+Cassandra sets both is minimum and maximum heap size on startup so will
+pre-allocate all memory to avoid freezes during operation (this happens
+during normal operation as more memory is allocated to heap.
+
+Words of Caution
+----------------
+
+Changing the configuration of a deployed Cassandra cluster is supported; however
+it will result in a restart of each Cassandra node as the changes are implemented
+which may result in outages.
+

=== modified file 'config.yaml'
--- config.yaml	2011-10-11 09:41:40 +0000
+++ config.yaml	2012-03-09 22:39:20 +0000
@@ -1,14 +1,14 @@
 options:
   jmx-port:
-    type: string
+    type: int
     default: 7199
     description: JMX management port
   cluster-port:
-    type: string
+    type: int
     default: 7000
     description: Port to support cluster communication
   client-port:
-    type: string
+    type: int
     default: 9160
     description: Port for client communcation
   cluster-name:
@@ -16,17 +16,17 @@
     default: "Test Cluster"
     description: Name of the Cassandra Cluster - don't change yet!
   auto-memory:
-    type: string
+    type: boolean
     default: true
-    description: Automatically configure memory options based on 
+    description: Automatically configure memory options based on
       specification of the server infrastructure its running on.
   heap-size:
     type: string
     default: 1G
-    description: Total size of Java memory heap, for example 1G or 512M. 
+    description: Total size of Java memory heap, for example 1G or 512M.
       Only used if auto-memory = false.
   new-gen-size:
     type: string
     default: 100M
-    description: Size of Java new generation memory, for example 100M. 
+    description: Size of Java new generation memory, for example 100M.
       Only used if auto-memory = false.

=== modified file 'hooks/cassandra-common'
--- hooks/cassandra-common	2011-10-13 09:45:00 +0000
+++ hooks/cassandra-common	2012-03-09 22:39:20 +0000
@@ -25,7 +25,7 @@
 install_cassandra () {
   juju-log "Installing Cassandra"
   # Install the repositories
-  echo "deb http://www.apache.org/dist/cassandra/debian 08x main" > /etc/apt/sources.list.d/cassandra.list
+  echo "deb http://www.apache.org/dist/cassandra/debian 10x main" > /etc/apt/sources.list.d/cassandra.list
   # Add the key
   apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 2B5C1B00
   # Update the repositories

=== modified file 'revision'
--- revision	2011-10-13 09:26:32 +0000
+++ revision	2012-03-09 22:39:20 +0000
@@ -1,1 +1,1 @@
-4
+5