openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Sync multi-http helper

Browse Source
This commit is contained in:
james.page@ubuntu.com
2014-09-22 16:51:30 +01:00
parent 7a78212bb0
commit 681e2df08f
14 changed files with 512 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/charmhelpers/contrib/hahelpers/apache.py
View File

@@ -20,7 +20,8 @@ from charmhelpers.core.hookenv import (
)
def get_cert():
def get_cert(cn):
# TODO: deal with multiple https endpoints via charm config
cert = config_get('ssl_cert')
key = config_get('ssl_key')
if not (cert and key):
@@ -30,10 +31,10 @@ def get_cert():
for r_id in relation_ids('identity-service'):
for unit in relation_list(r_id):
if not cert:
cert = relation_get('ssl_cert',
cert = relation_get('ssl_cert_{}'.format(cn),
rid=r_id, unit=unit)
if not key:
key = relation_get('ssl_key',
key = relation_get('ssl_key_{}'.format(cn),
rid=r_id, unit=unit)
return (cert, key)