Add workaround for SaltReqTimeout for 2019.2.7 MCP deployments
it needs to be removed after 2019.2.8 release
Change-Id: I85b6c645bc7bcba0a4638628bb3de2a2c055aeaf
Related-Prod:#PROD-00000
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt.yaml
index b22b9f3..1aed1d8 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt.yaml
@@ -6,11 +6,17 @@
{% import 'shared-salt.yaml' as SHARED with context %}
{% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
+{% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
+
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES() }}
-{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
+{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
+
+{{ SHARED_WORKAROUNDS.MACRO_SET_SALTAPI_TIMEOUT() }}
+
+
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt.yaml
index fad7ca6..b19adf2 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt.yaml
@@ -6,13 +6,16 @@
{% import 'shared-salt.yaml' as SHARED with context %}
{% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
+{% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES() }}
-{{SHARED.MACRO_IPFLUSH_TENANTS_IFACES()}}
+{{ SHARED.MACRO_IPFLUSH_TENANTS_IFACES() }}
-{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
+{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
+
+{{ SHARED_WORKAROUNDS.MACRO_SET_SALTAPI_TIMEOUT() }}
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt.yaml
index 0762ca3..4a8b1f3 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt.yaml
@@ -6,11 +6,14 @@
{% import 'shared-salt.yaml' as SHARED with context %}
{% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
+{% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES() }}
-{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
+{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
+
+{{ SHARED_WORKAROUNDS.MACRO_SET_SALTAPI_TIMEOUT() }}
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml
index 0fc17d8..76505ed 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt.yaml
@@ -6,14 +6,16 @@
{% import 'shared-salt.yaml' as SHARED with context %}
{% import 'shared-test-tools.yaml' as SHARED_TEST_TOOLS with context %}
-
+{% import 'shared-workarounds.yaml' as SHARED_WORKAROUNDS with context %}
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG() }}
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
+{{ SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES() }}
-{{SHARED.MACRO_IPFLUSH_TENANTS_IFACES()}}
+{{ SHARED.MACRO_IPFLUSH_TENANTS_IFACES() }}
-{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
\ No newline at end of file
+{{ SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS() }}
+
+{{ SHARED_WORKAROUNDS.MACRO_SET_SALTAPI_TIMEOUT() }}
\ No newline at end of file
diff --git a/tcp_tests/templates/shared-workarounds.yaml b/tcp_tests/templates/shared-workarounds.yaml
new file mode 100644
index 0000000..5104bcf
--- /dev/null
+++ b/tcp_tests/templates/shared-workarounds.yaml
@@ -0,0 +1,12 @@
+
+{%- macro MACRO_SET_SALTAPI_TIMEOUT() %}
+{######################################}
+- description: |
+ Set nginx_proxy_salt_api to 1800. RelatedProd:PROD-34798
+ #TODO Remove after released 2019.2.8
+ cmd: |
+ reclass-tools add-key parameters.nginx.server.site.nginx_proxy_salt_api.proxy.timeout 1800 /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/config/init.yml
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 1}
+ skip_fail: false
+{%- endmacro %}
\ No newline at end of file