Update candidate list with capacity attributes and version update

[optf/has.git] / conductor / conductor / service.py

diff --git a/conductor/conductor/service.py b/conductor/conductor/service.py
index 5d86cce..42fe99f 100644 (file)
--- 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
@@ -46,6 +46,13 @@ OPTS = [
     cfg.StrOpt('keyspace',
                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.'),
+    #TODO(larry): move to a new section [feature_supported] in config file
+    cfg.BoolOpt('HPA_enabled',
+                default=True)
 ]
 cfg.CONF.register_opts(OPTS)
 
@@ -101,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