commit 19a8ca585a8af76e697b7cbc284a3f80fded104a
author Tatyana Leontovich <tleontovich@mirantis.com> Fri Sep 08 12:24:28 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Fri Sep 08 05:25:36 2017 -0400
tree 4e527da8850185f0afe48818f64667c316c8152e
parent 2aa2da388998be147800c711fb0515a2cd82d735

Align sl ocata ovs

Change-Id: I154cf34af0ca54ad0aca84c22d9590fb581e2296
Reviewed-on: https://review.gerrithub.io/377669
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/templates/virtual-mcp-ocata-ovs/sl.yaml

diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/sl.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/sl.yaml
index 13237ee..688f70d 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/sl.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/sl.yaml
@@ -1,4 +1,6 @@
-{% from 'virtual-mcp-ocata/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'virtual-mcp-ocata-ovs/underlay.yaml' import HOSTNAME_CFG01 with context %}
+
+{% import 'shared-sl-tests.yaml' as SHARED_SL_TESTS with context %}
 
 # Install docker swarm
 - description: Install keepalived on mon nodes
@@ -139,18 +141,6 @@
   retry: {count: 1, delay: 10}
   skip_fail: false
 
-# Change environment configuration before deploy
-- description: Set SL docker images deploy parameters
-  cmd: |
-  {% for sl_opt, value in config.sl_deploy.items() %}
-    {% if value|string() %}
-    salt-call reclass.cluster_meta_set {{ sl_opt }} {{ value }};
-    {% endif %}
-  {% endfor %}
-  node_name: {{ HOSTNAME_CFG01 }}
-  retry: {count: 1, delay: 1}
-  skip_fail: false
-
 # Configure the services running in Docker Swarm
 - description: Install prometheus alertmanager
   cmd: salt -C 'I@docker:swarm' state.sls prometheus,heka.remote_collector -b 1
@@ -182,3 +172,5 @@
   retry: {count: 1, delay: 10}
   skip_fail: false
 
+{{  SHARED_SL_TESTS.MACRO_CLONE_SL_TESTS() }}
+{{  SHARED_SL_TESTS.MACRO_CONFIGURE_TESTS() }}