Skip to content

OpenStack plugin - Add support for reading credentials from openrc.sh #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parinporecha wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OpenStack plugin - Add support for reading credentials from openrc.sh #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion imagefactory_plugins/OpenStack/OpenStack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import json
import os
import struct
import getpass
from xml.etree.ElementTree import fromstring
from imgfac.Template import Template
from imgfac.ApplicationConfiguration import ApplicationConfiguration
Expand Down Expand Up @@ -51,6 +52,9 @@ def __init__(self):
self.version = GLANCE_VERSION
if self.version == 2:
self.credentials_attrs = [ 'auth_url', 'password', 'tenant', 'username']
self.openrc_credentials_attrs = { 'OS_AUTH_URL': 'auth_url',
'OS_TENANT_NAME': 'tenant',
'OS_USERNAME': 'username'}
else:
self.credentials_attrs = [ 'auth_url', 'password', 'strategy', 'tenant', 'username']

Expand Down Expand Up @@ -113,7 +117,11 @@ def openstack_decode_credentials(self, credentials):
self.activity("Preparing OpenStack credentials")
# TODO: Validate these - in particular, ensure that if some nodes are missing at least
# a minimal acceptable set of auth is present
doc = libxml2.parseDoc(credentials)
try:
doc = libxml2.parseDoc(credentials)
except libxml2.parserError:
self._populate_credentials_dict_from_openrc(credentials)
return

self.credentials_dict = { }
for authprop in self.credentials_attrs:
Expand All @@ -130,6 +138,18 @@ def _get_xml_node(self, doc, credtype):

return nodes[0].content

def _populate_credentials_dict_from_openrc(self, credentials_str):
credentials_list = credentials_str.split('\n')
self.credentials_dict = {}
for authprop in self.openrc_credentials_attrs.keys():
corresponding_authprop = self.openrc_credentials_attrs[authprop]
matching = [line for line in credentials_list if authprop in line]
if matching == []:
raise ImageFactoryException("Credentials file does not have required field - " + authprop)
self.credentials_dict[corresponding_authprop] = matching[0][matching[0].index('=') + 1 : ].strip('"')
self.credentials_dict['password'] = getpass.getpass(prompt='Please enter your OpenStack Password:\n')
self.credentials_token = None

def snapshot_image_on_provider(self, builder, provider, credentials, template, parameters):
# TODO: Implement snapshot builds
raise ImageFactoryException("Snapshot builds not currently supported on OpenStack KVM")
Expand Down