Merge lp:~hopem/charms/trusty/cinder/pki-token-support into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2134 cinder-next for hopem mp250170
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2134/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1923 cinder-next for hopem mp250170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1923/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2042 cinder-next for hopem mp250170
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2042/

[lp:~hopem/charms/trusty/cinder/pki-token-support]

75. By Edward Hope-Morley on 2015-02-24

synced /next

76. By Edward Hope-Morley on 2015-02-24

synced charm-helpers;

77. By Edward Hope-Morley on 2015-02-24

ensure apache2 stop+start if config changed

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2207 cinder-next for hopem mp250170
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2207/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1996 cinder-next for hopem mp250170
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1996/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2153 cinder-next for hopem mp250170
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10396306/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2153/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-01-26 09:47:37 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-02-24 14:13:55 +0000
@@ -279,9 +279,25 @@
 class IdentityServiceContext(OSContextGenerator):
     interfaces = ['identity-service']
 
+    def __init__(self, service=None, service_user=None):
+        self.service = service
+        self.service_user = service_user
+
     def __call__(self):
         log('Generating template context for identity-service', level=DEBUG)
         ctxt = {}
+
+        if self.service and self.service_user:
+            # This is required for pki token signing if we don't want /tmp to
+            # be used.
+            cachedir = '/var/cache/%s' % (self.service)
+            if not os.path.isdir(cachedir):
+                log("Creating service cache dir %s" % (cachedir), level=DEBUG)
+                mkdir(path=cachedir, owner=self.service_user,
+                      group=self.service_user, perms=0o700)
+
+            ctxt['signing_dir'] = cachedir
+
         for rid in relation_ids('identity-service'):
             for unit in related_units(rid):
                 rdata = relation_get(rid=rid, unit=unit)
@@ -291,15 +307,16 @@
                 auth_host = format_ipv6_addr(auth_host) or auth_host
                 svc_protocol = rdata.get('service_protocol') or 'http'
                 auth_protocol = rdata.get('auth_protocol') or 'http'
-                ctxt = {'service_port': rdata.get('service_port'),
-                        'service_host': serv_host,
-                        'auth_host': auth_host,
-                        'auth_port': rdata.get('auth_port'),
-                        'admin_tenant_name': rdata.get('service_tenant'),
-                        'admin_user': rdata.get('service_username'),
-                        'admin_password': rdata.get('service_password'),
-                        'service_protocol': svc_protocol,
-                        'auth_protocol': auth_protocol}
+                ctxt.update({'service_port': rdata.get('service_port'),
+                             'service_host': serv_host,
+                             'auth_host': auth_host,
+                             'auth_port': rdata.get('auth_port'),
+                             'admin_tenant_name': rdata.get('service_tenant'),
+                             'admin_user': rdata.get('service_username'),
+                             'admin_password': rdata.get('service_password'),
+                             'service_protocol': svc_protocol,
+                             'auth_protocol': auth_protocol})
+
                 if context_complete(ctxt):
                     # NOTE(jamespage) this is required for >= icehouse
                     # so a missing value just indicates keystone needs
@@ -1021,6 +1038,8 @@
                     for unit in related_units(rid):
                         ctxt['zmq_nonce'] = relation_get('nonce', unit, rid)
                         ctxt['zmq_host'] = relation_get('host', unit, rid)
+                        ctxt['zmq_redis_address'] = relation_get(
+                            'zmq_redis_address', unit, rid)
 
         return ctxt
 
 
=== added file 'hooks/charmhelpers/contrib/openstack/templates/zeromq'
--- hooks/charmhelpers/contrib/openstack/templates/zeromq	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/zeromq	2015-02-24 14:13:55 +0000
@@ -0,0 +1,14 @@
+{% if zmq_host -%}
+# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
+rpc_backend = zmq
+rpc_zmq_host = {{ zmq_host }}
+{% if zmq_redis_address -%}
+rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis
+matchmaker_heartbeat_freq = 15
+matchmaker_heartbeat_ttl = 30
+[matchmaker_redis]
+host = {{ zmq_redis_address }}
+{% else -%}
+rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_ring.MatchMakerRing
+{% endif -%}
+{% endif -%}
 
=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-02-04 19:29:31 +0000
+++ hooks/cinder_hooks.py	2015-02-24 14:13:55 +0000
@@ -417,6 +417,7 @@
     CONFIGS.write_all()
 
 
+@restart_on_change(restart_map(), stopstart=True)
 def configure_https():
     '''Enables SSL API Apache config if appropriate and kicks identity-service
     with any required api updates.
 
=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2014-12-15 10:17:11 +0000
+++ hooks/cinder_utils.py	2015-02-24 14:13:55 +0000
@@ -125,7 +125,9 @@
                               config_file=CINDER_CONF),
                           cinder_contexts.StorageBackendContext(),
                           cinder_contexts.LoggingConfigContext(),
-                          context.IdentityServiceContext(),
+                          context.IdentityServiceContext(
+                              service='cinder',
+                              service_user='cinder'),
                           context.BindHostContext(),
                           context.WorkerConfigContext()],
         'services': ['cinder-api', 'cinder-volume',
 
=== modified file 'templates/icehouse/cinder.conf'
--- templates/icehouse/cinder.conf	2014-10-07 12:27:23 +0000
+++ templates/icehouse/cinder.conf	2015-02-24 14:13:55 +0000
@@ -65,6 +65,7 @@
 admin_tenant_name = {{ admin_tenant_name }}
 admin_user = {{ admin_user }}
 admin_password = {{ admin_password }}
-{% endif -%}
+signing_dir = {{ signing_dir }}
+{% endif %}
 
 {% include "parts/section-database" %}