Merge lp:~adeuring/charms/precise/charmworld/es_shards_replicas into lp:~juju-jitsu/charms/precise/charmworld/trunk

[Abel Deuring]

While working on a fixed ES mapping for charms, I introduced two new options, es_shards and es_replicas, to charmworld's configuration.

The default values (1 shard, 0 replicas) are reasonable for development, but should be changed for production. This branch adds these parameters to the charmwold charm. I kept the default values because they work for each setup, but when two or more ElasticSearch nodes are running, it is reasonable to increase both parameters in order to use all nodes properly.

[Juju Gui Bot (juju-gui-bot)]

Looks good to me.

review: Approve

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-06-18 16:15:50 +0000
+++ config.yaml	2013-09-20 12:49:49 +0000
@@ -35,3 +35,15 @@
       description: |
         The maximum number of charms to import from Launchpad during ingest.
         -1 for no limit.
+  es_shards:
+    type: int
+    default: 1
+    description: |
+      The number of shards used by ElasticSearch for indices.
+  es_replicas:
+    type: int
+    default: 0
+    description: |
+      The number of replicas used by ElasticSearch for indices.
+      This number should not exceed the number of ElasticSearch nodes
+      minus one.

=== modified file 'scripts/write_config.py'
--- scripts/write_config.py	2013-06-18 16:15:50 +0000
+++ scripts/write_config.py	2013-09-20 12:49:49 +0000
@@ -20,7 +20,8 @@
 
 
 def write_new_config(mongo_url, es_url, error_handler, charm_import_limit,
-                     worker_interval, default, override, target):
+                     worker_interval, default, override, target, es_replicas,
+                     es_shards):
     new_config = read_config([default, override])
     new_config.set('app:main', 'mongo.url', mongo_url)
     new_config.set('app:main', 'es_urls', es_url)
@@ -43,6 +44,8 @@
         'app:main', 'script_lease_time', ingest_cycle)
     new_config.set(
         'app:main', 'worker_interval', worker_interval)
+    new_config.set('app:main', 'es_replicas', es_replicas)
+    new_config.set('app:main', 'es_shards', es_shards)
     with open(target, 'w') as output:
         new_config.write(output)
 
@@ -128,11 +131,14 @@
     juju_config = config()
     charm_import_limit = juju_config['charm_import_limit']
     worker_interval = juju_config['worker-interval']
+    es_shards = juju_config['es_shards']
+    es_replicas = juju_config['es_replicas']
 
     write_new_config(get_mongo_url(), get_elasticsearch_url(),
                      get_error_handler(), charm_import_limit,
                      worker_interval, default=sys.argv[1],
-                     override=sys.argv[2], target=sys.argv[3])
+                     override=sys.argv[2], target=sys.argv[3],
+                     es_replicas=es_replicas, es_shards=es_shards)
 
 
 if __name__ == '__main__':