x/cloudbase-init
Code Issues Proposed changes

Adds support for PEM certificte in user_data

Browse Source
This commit is contained in:
Alessandro Pilotti 2013-12-17 02:34:09 +02:00
parent 01a2e823c4
commit 61f1e4e825
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cloudbaseinit/plugins/windows/winrmcertificateauth.py
View File

@ -25,21 +25,32 @@ LOG = logging.getLogger(__name__)
class ConfigWinRMCertificateAuthPlugin(base.BasePlugin): class ConfigWinRMCertificateAuthPlugin(base.BasePlugin):
def _get_client_auth_cert(self, service): def _get_client_auth_cert(self, service):
cert_data = None
meta_data = service.get_meta_data('openstack') meta_data = service.get_meta_data('openstack')
meta = meta_data.get('meta') meta = meta_data.get('meta')
if meta: if meta:
i = 0 i = 0
cert_data = ""
while True: while True:
# Chunking is necessary as metadata items can be # Chunking is necessary as metadata items can be
# max. 255 chars long # max. 255 chars long
cert_chunk = meta.get('admin_cert%d' % i) cert_chunk = meta.get('admin_cert%d' % i)
if not cert_chunk: if not cert_chunk:
break break
cert_data += cert_chunk if not cert_data:
cert_data = cert_chunk
else:
cert_data += cert_chunk
i += 1 i += 1
return cert_data if not cert_data:
# Look if the user_data contains a PEM certificate
user_data = service.get_user_data('openstack')
if user_data.startswith(x509.PEM_HEADER):
cert_data = user_data
return cert_data
def _get_credentials(self, shared_data): def _get_credentials(self, shared_data):
user_name = shared_data.get(constants.SHARED_DATA_USERNAME) user_name = shared_data.get(constants.SHARED_DATA_USERNAME)