openstack
/
openstack
Code Issues Proposed changes

Update git submodules 

* Update charm-ceilometer from branch 'master'
  - Fix service_name in process_certificates call
    
    Fix service_name when calling process_certificates so it matches
    what ApacheSSLContext expects.
    
    Ceilometers Apache config is rendered using
    ceilometer_contexts.ApacheSSLContext. This class is a subclass of
    charmhelpers.contrib.openstack.context.ApacheSSLContext. The
    ceilometer specialised class sets 'service_namespace = "ceilometer"'.
    This is then used by parent class to set the destination for certs
    and keys to:
    
    ssl_dir = os.path.join('/etc/apache2/ssl/', self.service_namespace)
    
    The code to process incoming certificates from the certificates
    relation does something very similar.
    charmhelpers.contrib.openstack.cert_utils.process_certificates
    takes a service_name parameter. It uses this to set the destination
    directory that incoming certificates will be stored in:
    
    ssl_dir = os.path.join('/etc/apache2/ssl/', service_name)
    
    Obviously these two ssl directories need to match. But they do not
    because process_certificates is currently called like this:
    
    cert_utils.process_certificates('ceilometer-api', relation_id, unit)
    
    Change-Id: I41a26d00b4d2b22a5cfd2ef38ec76f2efd13f75b
    Closes-Bug: #1849292
This commit is contained in:
Liam Young 2019-10-22 11:04:55 +00:00 committed by Gerrit Code Review
parent 6bc51b20bb
commit 4212cf93c5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charm-ceilometer

@ -1 +1 @@
Subproject commit 9cb5185253d1040bfa48f281562eb5b4aa53c268
Subproject commit 1c5865f4f94f3c5265078a9bc52b7cbf5820c692