Add Active-Active code to has

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

diff --git a/conductor/conductor/opts.py b/conductor/conductor/opts.py
index bb18ac2..b32a39b 100644 (file)
--- a/conductor/conductor/opts.py
+++ b/conductor/conductor/opts.py
@@ -42,18 +42,20 @@ def list_opts():
         ('controller', itertools.chain(
             conductor.controller.service.CONTROLLER_OPTS,
             conductor.controller.translator_svc.CONTROLLER_OPTS)),
-        # ('data', conductor.data.plugins.inventory_provider.aai.DATA_OPTS),
+        ('data', conductor.data.service.DATA_OPTS),
         ('inventory_provider',
          itertools.chain(
              conductor.conf.inventory_provider.
-             INV_PROVIDER_EXT_MANAGER_OPTS)
+                 INV_PROVIDER_EXT_MANAGER_OPTS)
          ),
+        # ('data', conductor.data.plugins.inventory_provider.aai.DATA_OPTS),
+        ('inventory_provider', itertools.chain(
+            conductor.conf.inventory_provider.
+            INV_PROVIDER_EXT_MANAGER_OPTS)),
         ('aai', conductor.data.plugins.inventory_provider.aai.AAI_OPTS),
-        ('service_controller',
-         itertools.chain(
-             conductor.conf.service_controller.
-             SVC_CONTROLLER_EXT_MANAGER_OPTS)
-         ),
+        ('service_controller', itertools.chain(
+            conductor.conf.service_controller.
+            SVC_CONTROLLER_EXT_MANAGER_OPTS)),
         ('sdnc', conductor.data.plugins.service_controller.sdnc.SDNC_OPTS),
         ('messaging_server',
          conductor.common.music.messaging.component.MESSAGING_SERVER_OPTS),