Remove ETCD credential from SMS

The credentials for ETCD will be auto
generated during startup, so SMS is
not needed for storing the ETCD password

Issue-ID: OPTFRA-947
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>
Change-Id: I29f0796c4a8a32aa13f9429405b6271d7e0900f7

diff --git a/conductor/conductor/common/sms.py b/conductor/conductor/common/sms.py
index e889113..5a7c528 100644 (file)
--- a/conductor/conductor/common/sms.py
+++ b/conductor/conductor/common/sms.py
@@ -24,7 +24,6 @@ from oslo_log import log
 
 import conductor.api.controllers.v1.plans
 from conductor.common import config_loader
-import conductor.common.etcd.api
 import conductor.common.music.api
 from conductor.common.utils import cipherUtils
 import conductor.data.plugins.inventory_provider.aai
@@ -120,8 +119,6 @@ def load_secrets():
     config.set_override('aaf_conductor_user', secret_dict['aaf_api']['aaf_conductor_user'], 'aaf_api')
     config.set_override('username', secret_dict['sdc']['username'], 'sdc')
     config.set_override('password', decrypt_pass(secret_dict['sdc']['password']), 'sdc')
-    config.set_override('username', secret_dict['etcd_api']['username'], 'etcd_api')
-    config.set_override('password', decrypt_pass(secret_dict['etcd_api']['password']), 'etcd_api')
 
 
 def decrypt_pass(passwd):

diff --git a/csit/scripts/has-properties/has.json b/csit/scripts/has-properties/has.json
index 472bb5b..2074c6c 100644 (file)
--- a/csit/scripts/has-properties/has.json
+++ b/csit/scripts/has-properties/has.json
@@ -45,13 +45,6 @@
                     "password": "demo123456!",
                     "aaf_conductor_user": "oof@oof.onap.org"
                 }
-            },
-            {
-                "name": "etcd_api",
-                "values": {
-                    "username": "conductor",
-                    "password": "conductor"
-                }
             }
         ]
     }