| commit | 862f7754d5320bf7796ae95531513e5433aeeb35 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Jan 19 17:12:11 2018 +0200 |
| committer | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Jan 19 17:12:11 2018 +0200 |
| tree | e29a127f22128088da609871c10dfbe5ba704be6 | |
| parent | 01a5129c8c0d320bcefbfd00b1ddb8011660cb35 [diff] [blame] |
Use mcp_version for cookiecutter-templates models Previously used 'apt_mk_version' variable is now depends on 'mcp_version' cookiecutter parameter. Without mcp_version, 'jenkins_pipelines_branch' was set to master, and maybe some other components also was set to some defaults. Change-Id: Idb2a2580038fbeebda6b356950d0085021a779f3
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml index f791c23..304bdab 100644 --- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/salt-context-cookiecutter-contrail.yaml
@@ -1,4 +1,5 @@ default_context: + mcp_version: testing cicd_enabled: 'False' cluster_domain: cookied-bm-mcp-ocata-contrail.local cluster_name: deployment_name