Refactor config options

Doing following:
- Rename top-level config option group called 'cns' to the 'openshift'.
- Rename 'cns.setup.cns_project_name' option to the
  'openshift.storage_project_name'.
- Rename 'scale' option to the 'openshift.scale'.
- Delete ''devices' and 'zone' options from 'gluster_servers' config
  group.
- Delete 'cns.setup.cnd_username' option as unneeded.
- Delete 'cns.setup.cnd_password' option as unneeded.
- Delete 'oc_login' common function as unneeded after deletion of
  'cns.setup.cnd_username' and 'cns.setup.cnd_password' options.
- Remove 'Cns' word from base classes.
- Keep backwards compatibility for old options to make transition be
  smooth.

Change-Id: I04ddbbad5f64ffeac79a6744480d33a263d63001

1 files changed, 8 insertions, 4 deletions

diff --git a/cns-libs/cnslibs/common/heketi_ops.py b/cns-libs/cnslibs/common/heketi_ops.py
index 19729485..c13c8582 100644
--- a/cns-libs/cnslibs/common/heketi_ops.py
+++ b/cns-libs/cnslibs/common/heketi_ops.py
@@ -18,10 +18,12 @@ def _set_heketi_global_flags(heketi_server_url, **kwargs):
     secret_arg = "--secret %s" % secret if secret else ""
     user_arg = "--user %s" % user if user else ""
     if not user_arg:
-        heketi_cli_user = g.config['cns']['heketi_config']['heketi_cli_user']
+        openshift_config = g.config.get("cns", g.config.get("openshift"))
+        heketi_cli_user = openshift_config['heketi_config']['heketi_cli_user']
         if heketi_cli_user:
             user_arg = "--user %s" % heketi_cli_user
-            heketi_cli_key = g.config['cns']['heketi_config']['heketi_cli_key']
+            heketi_cli_key = openshift_config[
+                'heketi_config']['heketi_cli_key']
             if heketi_cli_key is not None:
                 secret_arg = "--secret '%s'" % heketi_cli_key
 
@@ -69,10 +71,12 @@ def heketi_volume_create(heketi_client_node, heketi_server_url, size,
     """
 
     if not kwargs.get('user'):
-        heketi_cli_user = g.config['cns']['heketi_config']['heketi_cli_user']
+        openshift_config = g.config.get("cns", g.config.get("openshift"))
+        heketi_cli_user = openshift_config['heketi_config']['heketi_cli_user']
         if heketi_cli_user:
             kwargs['user'] = heketi_cli_user
-            heketi_cli_key = g.config['cns']['heketi_config']['heketi_cli_key']
+            heketi_cli_key = openshift_config[
+                'heketi_config']['heketi_cli_key']
             if heketi_cli_key is not None:
                 kwargs['secret'] = heketi_cli_key