Skip to content

Commit

Permalink
openstack: support application_id auth
Browse files Browse the repository at this point in the history
  • Loading branch information
@karmab
karmab committed Aug 1, 2024
1 parent f1f1336 commit 97578c0
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 25 deletions.
3 changes: 2 additions & 1 deletion kvirt/cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2543,7 +2543,8 @@ def render_file(args):
inputfile = overrides.get('inputfile') or args.inputfile or 'kcli_plan.yml'
if container_mode():
inputfile = f"/workdir/{inputfile}"
baseconfig = Kbaseconfig(client=args.client, debug=args.debug)
offline = overrides.get('offline', False)
baseconfig = Kbaseconfig(client=args.client, debug=args.debug, offline=offline)
default_data = {f'config_{k}': baseconfig.default[k] for k in baseconfig.default}
client_data = {f'config_{k}': baseconfig.ini[baseconfig.client][k] for k in baseconfig.ini[baseconfig.client]}
client_data['config_type'] = client_data.get('config_type', 'kvm')
Expand Down
43 changes: 21 additions & 22 deletions kvirt/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,42 +234,39 @@ def __init__(self, client=None, debug=False, quiet=False, region=None, zone=None
debug=debug, datacenter=datacenter, cluster=cluster, ca_file=ca_file, org=org,
filtervms=filtervms, filteruser=filteruser, filtertag=filtertag)
elif self.type == 'openstack':
version = options.get('version', kdefaults.OPENSTACK['version'])
domain = next((e for e in [options.get('domain'),
os.environ.get("OS_USER_DOMAIN_NAME")] if e is not None),
kdefaults.OPENSTACK['domain'])
auth_url = next((e for e in [options.get('auth_url'),
os.environ.get("OS_AUTH_URL")] if e is not None),
None)
version = options.get('version') or kdefaults.OPENSTACK['version']
domain = options.get('domain') or os.environ.get("OS_USER_DOMAIN_NAME") or kdefaults.OPENSTACK['domain']
auth_url = options.get('auth_url') or os.environ.get("OS_AUTH_URL")
if auth_url is None:
error("Missing auth_url in the configuration. Leaving")
sys.exit(1)
user = next((e for e in [options.get('user'),
os.environ.get("OS_USERNAME")] if e is not None), kdefaults.OPENSTACK['user'])
project = next((e for e in [options.get('project'),
os.environ.get("OS_PROJECT_NAME")] if e is not None),
kdefaults.OPENSTACK['project'])
password = next((e for e in [options.get('password'),
os.environ.get("OS_PASSWORD")] if e is not None), None)
ca_file = next((e for e in [options.get('ca_file'),
os.environ.get("OS_CACERT")] if e is not None), None)
region_name = next((e for e in [options.get('region_name'),
os.environ.get("OS_REGION_NAME")] if e is not None), None)
user = options.get('user') or os.environ.get("OS_USERNAME") or kdefaults.OPENSTACK['user']
project = options.get('project') or os.environ.get("OS_PROJECT_NAME") or kdefaults.OPENSTACK['project']
password = options.get('password') or os.environ.get("OS_PASSWORD")
ca_file = options.get('ca_file') or os.environ.get("OS_CACERT")
region_name = options.get('region_name') or os.environ.get("OS_REGION_NAME")
external_network = options.get('external_network')
if auth_url.endswith('v2.0'):
domain = None
if ca_file is not None and not os.path.exists(os.path.expanduser(ca_file)):
error(f"Indicated ca_file {ca_file} not found. Leaving")
sys.exit(1)
glance_disk = options.get('glance_disk', False)
auth_token = next((e for e in [options.get('token'),
os.environ.get("OS_TOKEN")] if e is not None), None)
auth_type = 'token' if auth_token is not None else 'password'
auth_token = options.get('token') or os.environ.get("OS_TOKEN") or 'password'
default_auth_type = 'token' if auth_token is not None else 'password'
auth_type = options.get('auth_type') or os.environ.get("OS_AUTH_TYPE") or default_auth_type
if auth_type == 'password' and password is None:
error("Missing password in the configuration. Leaving")
sys.exit(1)
if auth_type == 'token':
user, password, domain = None, None, None
if auth_type == 'v3applicationcredential':
options_credential_id = options.get('application_credential_id')
env_application_credential_id = os.environ.get("OS_APPLICATION_CREDENTIAL_ID")
application_credential_id = options_credential_id or env_application_credential_id
options_credential_secret = options.get('application_credential_secret')
env_application_credential_secret = os.environ.get("OS_APPLICATION_CREDENTIAL_SECRET")
application_credential_secret = options_credential_secret or env_application_credential_secret
try:
from kvirt.providers.openstack import Kopenstack
except Exception as e:
Expand All @@ -278,7 +275,9 @@ def __init__(self, client=None, debug=False, quiet=False, region=None, zone=None
k = Kopenstack(host=self.host, port=self.port, user=user, password=password, version=version,
debug=debug, project=project, domain=domain, auth_url=auth_url, ca_file=ca_file,
external_network=external_network, region_name=region_name, glance_disk=glance_disk,
auth_type=auth_type, auth_token=auth_token)
auth_type=auth_type, auth_token=auth_token,
application_credential_id=application_credential_id,
application_credential_secret=application_credential_secret)
elif self.type == 'vsphere':
user = options.get('user')
if user is None:
Expand Down
12 changes: 10 additions & 2 deletions kvirt/providers/openstack/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,23 @@ class Kopenstack(object):
"""
def __init__(self, host='127.0.0.1', version='3', port=None, user='root', password=None, debug=False, project=None,
domain='Default', auth_url=None, ca_file=None, external_network=None, region_name=None,
glance_disk=False, auth_type='password', auth_token=None):
glance_disk=False, auth_type='password', auth_token=None, application_credential_id=None,
application_credential_secret=None):
self.debug = debug
self.host = host
loader = loading.get_plugin_loader(auth_type)
if auth_type == 'password':
auth = loader.load_from_options(auth_url=auth_url, username=user, password=password, project_name=project,
user_domain_name=domain, project_domain_name=domain)
else:
elif auth_type == 'v3applicationcredential':
auth = loader.load_from_options(auth_url=auth_url, application_credential_id=application_credential_id,
application_credential_secret=application_credential_secret)
elif auth_type == 'token':
auth = loader.load_from_options(auth_url=auth_url, token=auth_token, project_id=project)
else:
error(f"Unsupported auth_type {auth_type}")
self.conn = None
return
if ca_file is not None:
sess = session.Session(auth=auth, verify=os.path.expanduser(ca_file))
else:
Expand Down

0 comments on commit 97578c0

Please sign in to comment.