| commit | cf2dd4c4a6f2153b1c19cf653b733856477d81d2 | [log] [tgz] |
|---|---|---|
| author | Tatyanka Leontovich <tleontovich@mirantis.com> | Mon Oct 29 18:56:10 2018 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Mon Oct 29 18:56:10 2018 +0000 |
| tree | be7ba8a0c387923e2eb0d3911fa178c3d20e4039 | |
| parent | cf8aa102178a76f74c1fbbb2518edd86c17f9795 [diff] | |
| parent | 21ab5d75251e3245498cfcda0eb5dd2b3652aef0 [diff] |
Merge "Remove stacklight_long_term_storage_type from cookiecutter template"
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml index 308051a..326d20e 100644 --- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml +++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/k8s.yaml
@@ -131,7 +131,7 @@ - description: Run Kubernetes master setup cmd: salt --hard-crash --state-output=mixed --state-verbose=False - -C 'I@kubernetes:master and *01*' state.sls kubernetes.master.setup + -C 'I@kubernetes:master' state.sls kubernetes.master.setup node_name: {{ HOSTNAME_CFG01 }} retry: {count: 1, delay: 5} skip_fail: false
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml index 0699684..53bf0bb 100644 --- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml +++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
@@ -187,7 +187,6 @@ stacklight_log_node02_hostname: log02 stacklight_log_node03_address: 10.167.8.63 stacklight_log_node03_hostname: log03 - stacklight_long_term_storage_type: influxdb stacklight_monitor_address: 10.167.8.70 stacklight_monitor_hostname: mon stacklight_monitor_node01_address: 10.167.8.71