Sync conductor configurations across all projects

Sync conductor.conf based on tox generated config.
Added missing parameters which were not generated by tox.
Separtate patches needs to be submitted to OOM, HEAT, CSIT

Change-Id: I9c055f01d4d358f028eac4e752980d3c83a62468
Issue-ID: OPTFRA-205
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>

5 files changed, 15 insertions, 9 deletions

diff --git a/conductor/conductor/api/app.py b/conductor/conductor/api/app.py
index 70d54b5..e8f3d63 100644
--- a/conductor/conductor/api/app.py
+++ b/conductor/conductor/api/app.py
@@ -33,7 +33,7 @@ LOG = log.getLogger(__name__)
 
 CONF = cfg.CONF
 
-OPTS = [
+WSGI_OPTS = [
     cfg.StrOpt('api_paste_config',
                default="api_paste.ini",
                help="Configuration file for WSGI definition of API."
@@ -51,7 +51,7 @@ API_OPTS = [
                ),
 ]
 
-CONF.register_opts(OPTS)
+CONF.register_opts(WSGI_OPTS)
 CONF.register_opts(API_OPTS, group='api')
 
 # Pull in service opts. We use them here.
diff --git a/conductor/conductor/data/plugins/inventory_provider/aai.py b/conductor/conductor/data/plugins/inventory_provider/aai.py
index fdf914a..f37a40a 100644
--- a/conductor/conductor/data/plugins/inventory_provider/aai.py
+++ b/conductor/conductor/data/plugins/inventory_provider/aai.py
@@ -55,10 +55,10 @@ AAI_OPTS = [
                help='Base URL for A&AI, up to and not including '
                     'the version, and without a trailing slash.'),
     cfg.StrOpt('aai_rest_timeout',
-               default=30,
+               default='30',
                help='Timeout for A&AI Rest Call'),
     cfg.StrOpt('aai_retries',
-               default=3,
+               default='3',
                help='Number of retry for A&AI Rest Call'),
     cfg.StrOpt('server_url_version',
                default='v10',
diff --git a/conductor/conductor/data/plugins/service_controller/sdnc.py b/conductor/conductor/data/plugins/service_controller/sdnc.py
index 3242384..5518a93 100644
--- a/conductor/conductor/data/plugins/service_controller/sdnc.py
+++ b/conductor/conductor/data/plugins/service_controller/sdnc.py
@@ -46,10 +46,10 @@ SDNC_OPTS = [
     cfg.StrOpt('password',
                help='Basic Authentication Password'),
     cfg.StrOpt('sdnc_rest_timeout',
-               default=30,
+               default='30',
                help='Timeout for SDNC Rest Call'),
     cfg.StrOpt('sdnc_retries',
-               default=3,
+               default='3',
                help='Retry Numbers for SDNC Rest Call'),
 ]
 
diff --git a/conductor/conductor/data/plugins/vim_controller/multicloud.py b/conductor/conductor/data/plugins/vim_controller/multicloud.py
index 8eec9fa..3d904b4 100644
--- a/conductor/conductor/data/plugins/vim_controller/multicloud.py
+++ b/conductor/conductor/data/plugins/vim_controller/multicloud.py
@@ -37,10 +37,10 @@ MULTICLOUD_OPTS = [
                default='http://msb.onap.org/api/multicloud',
                help='Base URL for Multicloud without a trailing slash.'),
     cfg.StrOpt('multicloud_rest_timeout',
-               default=30,
+               default='30',
                help='Timeout for Multicloud Rest Call'),
     cfg.StrOpt('multicloud_retries',
-               default=3,
+               default='3',
                help='Number of retry for Multicloud Rest Call'),
     cfg.StrOpt('server_url_version',
                default='v0',
diff --git a/conductor/conductor/opts.py b/conductor/conductor/opts.py
index d34fbcc..106de2d 100644
--- a/conductor/conductor/opts.py
+++ b/conductor/conductor/opts.py
@@ -19,7 +19,9 @@
 
 import itertools
 
+import conductor.api.adapters.aaf.aaf_authentication
 import conductor.api.app
+import conductor.api.controllers.v1.plans
 import conductor.common.music.api
 import conductor.common.music.messaging.component
 import conductor.common.prometheus_metrics
@@ -40,9 +42,11 @@ import conductor.solver.service
 def list_opts():
     return [
         ('DEFAULT', itertools.chain(
-            conductor.api.app.OPTS,
+            conductor.api.app.WSGI_OPTS,
             conductor.service.OPTS)),
         ('api', conductor.api.app.API_OPTS),
+        ('conductor_api',
+         conductor.api.controllers.v1.plans.CONDUCTOR_API_OPTS),
         ('controller', itertools.chain(
             conductor.controller.service.CONTROLLER_OPTS,
             conductor.controller.translator_svc.CONTROLLER_OPTS)),
@@ -71,5 +75,7 @@ def list_opts():
         ('solver', conductor.solver.service.SOLVER_OPTS),
         ('reservation', conductor.reservation.service.reservation_OPTS),
         ('aaf_sms', conductor.common.sms.AAF_SMS_OPTS),
+        ('aaf_authentication',
+         conductor.api.adapters.aaf.aaf_authentication.AAF_OPTS),
         ('prometheus', conductor.common.prometheus_metrics.METRICS_OPTS),
     ]