| commit | c83fe6b0d9fd65fcc9531fb8f1a5fc36a79008a7 | [log] [tgz] |
|---|---|---|
| author | ibumarskov <ibumarskov@mirantis.com> | Mon Jul 09 13:17:32 2018 +0400 |
| committer | bumarskov <bumarskov@gmail.com> | Mon Jul 23 04:51:43 2018 +0000 |
| tree | 4244e4e93169b5525f094467205a67b411d4f1d3 | |
| parent | e05033609a74780cfb57f11516e990bfa9d90754 [diff] |
Delete duplicated steps (mitaka-ovs/dvr) Change-Id: I5aa8ba3283b7b7b8d15eb5e35e730cac41a60712
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-dvr.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-dvr.yaml index 602fae8..aef434f 100644 --- a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-dvr.yaml +++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-dvr.yaml
@@ -32,15 +32,6 @@ retry: {count: 1, delay: 1} skip_fail: false -{{ SHARED.MACRO_INSTALL_PACKAGES_ON_NODES(HOSTNAME_CFG01) }} -- description: Re-install all the fromulas - cmd: | - set -e; - apt-get install -y salt-formula-* - node_name: {{ HOSTNAME_CFG01 }} - retry: {count: 1, delay: 1} - skip_fail: false - - description: Sync formulas to service cmd: | set -e;
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-ovs.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-ovs.yaml index 37e7e92..f279453 100644 --- a/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-ovs.yaml +++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-mcp-mitaka-ovs.yaml
@@ -47,14 +47,6 @@ retry: {count: 1, delay: 1} skip_fail: false -{{ SHARED.MACRO_INSTALL_PACKAGES_ON_NODES(HOSTNAME_CFG01) }} -- description: Re-install all the fromulas - cmd: | - set -e; - apt-get install -y salt-formula-* - node_name: {{ HOSTNAME_CFG01 }} - retry: {count: 1, delay: 1} - skip_fail: false {{ SHARED.MACRO_GENERATE_COOKIECUTTER_MODEL() }} {{ SHARED.MACRO_GENERATE_AND_ENABLE_ENVIRONMENT_MODEL() }}