From 75cc5012e3c9ddff6e1222c36725a5ea1ca5e505 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 17 Mar 2020 11:20:31 -0500
Subject: [PATCH] Update os_client_config to use openstacksdk

This never got migrated but should. os-client-config is only
on life support.

Change-Id: I2d77c9f7d147900b79a410c17cce197108c0a69b
---
 plugins/modules/os_client_config.py | 20 +++++++++++---------
 tox.ini                             |  1 -
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/modules/os_client_config.py b/plugins/modules/os_client_config.py
index 4fc08c0b..71e878d6 100644
--- a/plugins/modules/os_client_config.py
+++ b/plugins/modules/os_client_config.py
@@ -26,7 +26,9 @@ options:
      default: []
      type: list
      elements: str
-requirements: [ os-client-config ]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 author: "Monty Taylor (@emonty)"
 '''
 
@@ -45,11 +47,11 @@ EXAMPLES = '''
 '''
 
 try:
-    import os_client_config
-    from os_client_config import exceptions
-    HAS_OS_CLIENT_CONFIG = True
+    import openstack.config
+    from openstack import exceptions
+    HAS_OPENSTACKSDK = True
 except ImportError:
-    HAS_OS_CLIENT_CONFIG = False
+    HAS_OPENSTACKSDK = False
 
 from ansible.module_utils.basic import AnsibleModule
 
@@ -59,20 +61,20 @@ def main():
         clouds=dict(required=False, type='list', default=[], elements='str'),
     ))
 
-    if not HAS_OS_CLIENT_CONFIG:
-        module.fail_json(msg='os-client-config is required for this module')
+    if not HAS_OPENSTACKSDK:
+        module.fail_json(msg='openstacksdk is required for this module')
 
     p = module.params
 
     try:
-        config = os_client_config.OpenStackConfig()
+        config = openstack.config.OpenStackConfig()
         clouds = []
         for cloud in config.get_all_clouds():
             if not p['clouds'] or cloud.name in p['clouds']:
                 cloud.config['name'] = cloud.name
                 clouds.append(cloud.config)
         module.exit_json(ansible_facts=dict(openstack=dict(clouds=clouds)))
-    except exceptions.OpenStackConfigException as e:
+    except exceptions.ConfigException as e:
         module.fail_json(msg=str(e))
 
 
diff --git a/tox.ini b/tox.ini
index 341f6460..da28c62b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,7 +61,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,ansible_collections
 passenv = HOME USER ANSIBLE_VAR_*
 deps =
     {[testenv]deps}
-    {toxinidir}/../os-client-config
     {toxinidir}/../openstacksdk
     ansible
 commands =