Merge lp:~james-page/charms/trusty/glance/worker-config into lp:~openstack-charmers-archive/charms/trusty/glance/next

[James Page]

[Liam Young (gnuoy)]

Approve

review: Approve

[lp:~james-page/charms/trusty/glance/worker-config]

70. By James Page on 2014-10-07

Rebase

=== modified file 'config.yaml'
--- config.yaml	2014-10-06 21:26:18 +0000
+++ config.yaml	2014-10-07 19:33:37 +0000
@@ -146,3 +146,10 @@
       order for this charm to function correctly, the privacy extension must be
       disabled and a non-temporary address must be configured/available on
       your network interface.
+  worker-multiplier:
+    type: int
+    default: 2
+    description: |
+      The CPU core multiplier to use when configuring worker processes for
+      Glance.  By default, the number of workers for each daemon is set to
+      twice the number of CPU cores a service unit has.

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-10-07 09:02:12 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-10-07 19:33:37 +0000
@@ -903,3 +903,22 @@
             return {
                 'bind_host': '0.0.0.0'
             }
+
+
+class WorkerConfigContext(OSContextGenerator):
+
+    @property
+    def num_cpus(self):
+        try:
+            from psutil import NUM_CPUS
+        except ImportError:
+            apt_install('python-psutil', fatal=True)
+            from psutil import NUM_CPUS
+        return NUM_CPUS
+
+    def __call__(self):
+        multiplier = config('worker-multiplier') or 1
+        ctxt = {
+            "workers": self.num_cpus * multiplier
+        }
+        return ctxt

=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2014-10-07 14:47:14 +0000
+++ hooks/glance_utils.py	2014-10-07 19:33:37 +0000
@@ -83,7 +83,8 @@
                           context.IdentityServiceContext(),
                           context.SyslogContext(),
                           glance_contexts.LoggingConfigContext(),
-                          glance_contexts.GlanceIPv6Context()],
+                          glance_contexts.GlanceIPv6Context(),
+                          context.WorkerConfigContext()],
         'services': ['glance-registry']
     }),
     (GLANCE_API_CONF, {
@@ -97,6 +98,7 @@
                           context.SyslogContext(),
                           glance_contexts.LoggingConfigContext(),
                           glance_contexts.GlanceIPv6Context(),
+                          context.WorkerConfigContext(),
                           glance_contexts.MultiStoreContext()],
         'services': ['glance-api']
     }),

=== modified file 'templates/icehouse/glance-api.conf'
--- templates/icehouse/glance-api.conf	2014-10-07 09:19:09 +0000
+++ templates/icehouse/glance-api.conf	2014-10-07 19:33:37 +0000
@@ -2,6 +2,7 @@
 verbose = {{ verbose }}
 use_syslog = {{ use_syslog }}
 debug = {{ debug }}
+workers = {{ workers }}
 
 {% if rbd_pool -%}
 default_store = rbd

=== modified file 'templates/icehouse/glance-registry.conf'
--- templates/icehouse/glance-registry.conf	2014-08-06 12:32:10 +0000
+++ templates/icehouse/glance-registry.conf	2014-10-07 19:33:37 +0000
@@ -2,6 +2,7 @@
 verbose = {{ verbose }}
 use_syslog = {{ use_syslog }}
 debug = {{ debug }}
+workers = {{ workers }}
 
 bind_host = {{ bind_host }}
 bind_port = 9191

=== modified file 'templates/juno/glance-api.conf'
--- templates/juno/glance-api.conf	2014-10-07 15:19:08 +0000
+++ templates/juno/glance-api.conf	2014-10-07 19:33:37 +0000
@@ -2,6 +2,7 @@
 verbose = {{ verbose }}
 use_syslog = {{ use_syslog }}
 debug = {{ debug }}
+workers = {{ workers }}
 
 known_stores = {{ known_stores }}
 {% if rbd_pool -%}