commit 8f6a63e52c6cc95b898fa443befae674d152c4cf
author Dmitry Tyzhnenko <t.dmitry@gmail.com> Tue Sep 05 15:37:23 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Tue Sep 05 12:56:25 2017 -0400
tree c04f6c1601fdc8b37ed067ddeedca19d433727ed
parent 126b003325461530a6cf8369f9ea051b1842b3bc

Add policy json tests

Change-Id: I12210f8a704a52386137a7d8293f4fe200122cbd
Reviewed-on: https://review.gerrithub.io/377174
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 86ef7b8..cb56399 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -32,6 +32,8 @@
     __name__, 'templates/{0}/salt.yaml'.format(settings.LAB_CONFIG_NAME))
 _default_environment_template_dir = pkg_resources.resource_filename(
     __name__, 'environment/')
+_default_templates_dir = pkg_resources.resource_filename(
+    __name__, 'templates/')
 _default_common_services_steps = pkg_resources.resource_filename(
     __name__,
     'templates/{0}/common-services.yaml'.format(
@@ -123,6 +125,9 @@
     ct.Cfg('environment_template_dir', ct.String(),
            help="Path to directory with Environment template and inventory",
            default=_default_environment_template_dir),
+    ct.Cfg('templates_dir', ct.String(),
+           help="Path to directory with templates",
+           default=_default_templates_dir),
 ]
 salt_opts = [
     ct.Cfg('salt_master_host', ct.IPAddress(),
@@ -370,8 +375,9 @@
     config.register_group(cfg.OptGroup(name='opencontrail',
                           title="Options for Juniper contrail-tests", help=""))
     config.register_opts(group='opencontrail', opts=opencontrail_opts)
-    config.register_group(cfg.OptGroup(name='stack_light',
-                                       title="StackLight config and credentials", help=""))
+    config.register_group(
+        cfg.OptGroup(name='stack_light',
+                     title="StackLight config and credentials", help=""))
     config.register_opts(group='stack_light', opts=sl_opts)
     config.register_group(
         cfg.OptGroup(name='sl_deploy',