Make docker login key a configuration param

Change-Id: Iacd0d4d350dd392b93439addad63b1d4ee2e4694
Issue-Id: DCAEGEN2-151
Signed-off-by: Michael Hwang <mhwang@research.att.com>

diff --git a/dcae-cli/ChangeLog.md b/dcae-cli/ChangeLog.md
index 7eb38d9..59c17f3 100644 (file)
--- a/dcae-cli/ChangeLog.md
+++ b/dcae-cli/ChangeLog.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * Setup database connection via manual user inputs if seed config not there
 * Seeding profiles is no longer a fatal issue
 * Dynamically fetch Docker login credentials from Consul to use to authenticate when creating Docker client.
+* Make docker login key into a configuration param
 
 ## [2.9.0]
 

diff --git a/dcae-cli/dcae_cli/util/config.py b/dcae-cli/dcae_cli/util/config.py
index d3d9f16..3d6ac0a 100644 (file)
--- a/dcae-cli/dcae_cli/util/config.py
+++ b/dcae-cli/dcae_cli/util/config.py
@@ -110,6 +110,14 @@ def get_server_url():
     """
     return get_config().get("server_url")
 
+def get_docker_logins_key():
+    """Returns the Consul key that Docker logins are stored under
+
+    Default is "docker_plugin/docker_logins" which matches up with the docker
+    plugin default.
+    """
+    return get_config().get("docker_logins_key", "docker_plugin/docker_logins")
+
 # These functions are used to fetch the configurable path to the various json
 # schema files used in validation.
 

diff --git a/dcae-cli/dcae_cli/util/discovery.py b/dcae-cli/dcae_cli/util/discovery.py
index cbfd617..2b3c597 100644 (file)
--- a/dcae-cli/dcae_cli/util/discovery.py
+++ b/dcae-cli/dcae_cli/util/discovery.py
@@ -37,6 +37,7 @@ from consul import Consul
 from dcae_cli.util.logger import get_logger
 from dcae_cli.util.exc import DcaeException
 from dcae_cli.util.profiles import get_profile
+from dcae_cli.util.config import get_docker_logins_key
 
 
 logger = get_logger('Discovery')
@@ -470,7 +471,7 @@ def get_docker_logins(host=consul_host):
     List of objects where the objects must be of the form
         {"registry": .., "username":.., "password":.. }
     """
-    key = "dockerlogin_info"
+    key = get_docker_logins_key()
     (index, val) = Consul(host).kv.get(key)
 
     if val: