| commit | 9cc824c1ad6f96c48be7ccae7eea183ece05f118 | [log] [tgz] |
|---|---|---|
| author | Victor Ryzhenkin <vryzhenkin@mirantis.com> | Thu Oct 12 19:02:23 2017 +0400 |
| committer | Victor Ryzhenkin <vryzhenkin@mirantis.com> | Thu Oct 19 19:46:52 2017 +0400 |
| tree | 85fa1bba15d291979b024ce8950f34854f3374f1 | |
| parent | c791368272fecd012f434c6bbba7a09b9bfe42a9 [diff] [blame] |
Move k8s overrides into shared-salt Since docker used not only in k8s fixtures, we need to mitigate it. This patch introduces overrides on salt stage to cover docker install in other stages like stacklight. Change-Id: I890407da15bd468b18a117ef4caa1d33dddad5cb
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/salt.yaml b/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/salt.yaml index f84a6b6..37e841d 100644 --- a/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/salt.yaml +++ b/tcp_tests/templates/virtual-mcp11-k8s-calico-minimal/salt.yaml
@@ -17,6 +17,8 @@ {{ SHARED.MACRO_RUN_SALT_MASTER_UNDERLAY_STATES() }} +{{ SHARED.ADJUST_K8S_OPTS() }} + {{ SHARED.MACRO_GENERATE_INVENTORY() }} {{ SHARED.MACRO_BOOTSTRAP_ALL_MINIONS() }}