| commit | 77f0bddbe7abe209fb19eaaf9ea0779b58cb3844 | [log] [tgz] |
|---|---|---|
| author | Tatyana Leontovich <tleontovich@mirantis.com> | Mon Apr 02 21:53:48 2018 +0300 |
| committer | Tatyana Leontovich <tleontovich@mirantis.com> | Mon Apr 02 21:53:48 2018 +0300 |
| tree | 629dd5fadcbb9a683472382c45d5916247d81e4d | |
| parent | 94a88e2e613faf4239b4493e4c019827b8b22167 [diff] |
Remote SL from template for pike static Change-Id: I442956c76ce8854d15ccfead6d5848b61a34f65e
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/salt.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/salt.yaml index bfe80e7..0c649fd 100644 --- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/salt.yaml +++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl-barbican/salt.yaml
@@ -20,8 +20,6 @@ {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }} -{{ SHARED.ADJUST_SL_OPTS(OVERRIDES_FILENAME='/srv/salt/reclass/classes/cluster/' + SHARED.CLUSTER_NAME + '/stacklight/server.yml') }} - {{ SHARED.MACRO_GENERATE_INVENTORY() }} {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/salt.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/salt.yaml index d56e449..d32da7a 100644 --- a/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/salt.yaml +++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ssl/salt.yaml
@@ -20,8 +20,6 @@ {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }} -{{ SHARED.ADJUST_SL_OPTS(OVERRIDES_FILENAME='/srv/salt/reclass/classes/cluster/' + SHARED.CLUSTER_NAME + '/stacklight/server.yml') }} - {{ SHARED.MACRO_GENERATE_INVENTORY() }} {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/salt.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/salt.yaml index 805e184..6552a32 100644 --- a/tcp_tests/templates/virtual-mcp-pike-dvr/salt.yaml +++ b/tcp_tests/templates/virtual-mcp-pike-dvr/salt.yaml
@@ -20,8 +20,6 @@ {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }} -{{ SHARED.ADJUST_SL_OPTS(OVERRIDES_FILENAME='/srv/salt/reclass/classes/cluster/' + SHARED.CLUSTER_NAME + '/stacklight/server.yml') }} - {{ SHARED.MACRO_GENERATE_INVENTORY() }} {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/salt.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/salt.yaml index 422e178..2422750 100644 --- a/tcp_tests/templates/virtual-mcp-pike-ovs/salt.yaml +++ b/tcp_tests/templates/virtual-mcp-pike-ovs/salt.yaml
@@ -20,8 +20,6 @@ {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }} -{{ SHARED.ADJUST_SL_OPTS(OVERRIDES_FILENAME='/srv/salt/reclass/classes/cluster/' + SHARED.CLUSTER_NAME + '/stacklight/server.yml') }} - {{ SHARED.MACRO_GENERATE_INVENTORY() }} {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}