X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=conductor%2Fconductor%2Fservice.py;h=42fe99fb445eeafa963ca0014dad69097b537ef4;hb=refs%2Ftags%2F2.3.0;hp=d5bf3488c70a87f3c0ccdbfb4bdff86729eb4ac6;hpb=b94e42060b59c84e085221502a3ad019f679c614;p=optf%2Fhas.git

diff --git a/conductor/conductor/service.py b/conductor/conductor/service.py
index d5bf348..42fe99f 100644
--- a/conductor/conductor/service.py
+++ b/conductor/conductor/service.py
@@ -17,10 +17,10 @@
 # -------------------------------------------------------------------------
 #
 
-# import socket
 import sys
 
 # from keystoneauth1 import loading as ka_loading
+from conductor.common import sms
 from oslo_config import cfg
 import oslo_i18n
 from oslo_log import log
@@ -47,9 +47,12 @@ OPTS = [
                default='conductor',
                help='Music keyspace for content'),
     cfg.IntOpt('delay_time',
-               default=2,
-               help='Delay time (Seconds) for MUSIC requests. Set it to 2 seconds '
-                    'by default.'),
+                default=2,
+                help='Delay time (Seconds) for MUSIC requests. Set it to 2 seconds '
+                     'by default.'),
+    #TODO(larry): move to a new section [feature_supported] in config file
+    cfg.BoolOpt('HPA_enabled',
+                default=True)
 ]
 cfg.CONF.register_opts(OPTS)
 
@@ -105,4 +108,7 @@ def prepare_service(argv=None, config_files=None):
     if argv:
         gmr.TextGuruMeditation.setup_autorun(version)
     messaging.setup()
+    # Load secrets from SMS
+    if conf.aaf_sms.is_enabled:
+        sms.load_secrets()
     return conf