openstack/charm-keystone
Code Issues Proposed changes

keystone ssl ca sync whenver we sync passwords

Browse Source
This commit is contained in:
Kapil Thangavelu 2014-03-04 08:56:18 -05:00
parent 45ca9775cd
commit 41e6992ea7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/keystone_ssl.py
View File

@ -1,10 +1,12 @@
#!/usr/bin/python #!/usr/bin/python
import base64
import os import os
import shutil import shutil
import subprocess import subprocess
import tarfile import tarfile
import tempfile import tempfile
import zipfile
CA_EXPIRY = '365' CA_EXPIRY = '365'
ORG_NAME = 'Ubuntu' ORG_NAME = 'Ubuntu'

6
hooks/keystone_utils.py
View File

@ -552,6 +552,9 @@ def synchronize_service_credentials():
unison.sync_to_peers(peer_interface='cluster', unison.sync_to_peers(peer_interface='cluster',
paths=[SERVICE_PASSWD_PATH], user=SSH_USER, paths=[SERVICE_PASSWD_PATH], user=SSH_USER,
verbose=True) verbose=True)
if config('http-service-endpoints') in ['True', 'true']:
unison.sync_to_peers(peer_interface='cluster',
paths=[SSL_DIR], user=SSH_USER, verbose=True)
CA = [] CA = []
@ -746,9 +749,6 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
relation_data['ssl_key'] = b64encode(key) relation_data['ssl_key'] = b64encode(key)
relation_data['ca_cert'] = b64encode(ca_bundle) relation_data['ca_cert'] = b64encode(ca_bundle)
relation_data['https_keystone'] = 'True' relation_data['https_keystone'] = 'True'
if is_clustered():
unison.sync_to_peers(peer_interface='cluster',
paths=[SSL_DIR], user=SSH_USER, verbose=True)
relation_set(relation_id=relation_id, relation_set(relation_id=relation_id,
**relation_data) **relation_data)