diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-08 11:16:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-08 11:16:04 -0400 |
| commit | 756ab33088b81ea21eab20869c11dd9d7b2dab7b (patch) | |
| tree | 7daf5c35a4ef5fb9ddbb0ccc4bb9b129a86e8299 /roles | |
| parent | faed701d8fd50e7ce6540fd59c2f15fea82de0f6 (diff) | |
| parent | d2bf958251e4092ba90218cd3cc20621483b3057 (diff) | |
| download | openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.tar.gz openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.tar.bz2 openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.tar.xz openshift-756ab33088b81ea21eab20869c11dd9d7b2dab7b.zip | |
Merge pull request #5289 from jcantrill/1487573_fix_allowed_es_version
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging_curator/vars/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/vars/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_fluentd/vars/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_kibana/vars/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/vars/main.yml | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/roles/openshift_logging_curator/vars/main.yml b/roles/openshift_logging_curator/vars/main.yml index 97525479e..95bf462d1 100644 --- a/roles/openshift_logging_curator/vars/main.yml +++ b/roles/openshift_logging_curator/vars/main.yml @@ -1,3 +1,3 @@ --- -__latest_curator_version: "3_5" -__allowed_curator_versions: ["3_5", "3_6"] +__latest_curator_version: "3_6" +__allowed_curator_versions: ["3_5", "3_6", "3_7"] diff --git a/roles/openshift_logging_elasticsearch/vars/main.yml b/roles/openshift_logging_elasticsearch/vars/main.yml index 20fa63543..09e2ee4d0 100644 --- a/roles/openshift_logging_elasticsearch/vars/main.yml +++ b/roles/openshift_logging_elasticsearch/vars/main.yml @@ -1,6 +1,6 @@ --- -__latest_es_version: "3_5" -__allowed_es_versions: ["3_5", "3_6"] +__latest_es_version: "3_6" +__allowed_es_versions: ["3_5", "3_6", "3_7"] __allowed_es_types: ["data-master", "data-client", "master", "client"] __es_log_appenders: ['file', 'console'] __kibana_index_modes: ["unique", "shared_ops"] diff --git a/roles/openshift_logging_fluentd/vars/main.yml b/roles/openshift_logging_fluentd/vars/main.yml index ec8e565c3..92a426952 100644 --- a/roles/openshift_logging_fluentd/vars/main.yml +++ b/roles/openshift_logging_fluentd/vars/main.yml @@ -1,5 +1,5 @@ --- -__latest_fluentd_version: "3_5" -__allowed_fluentd_versions: ["3_5", "3_6"] +__latest_fluentd_version: "3_6" +__allowed_fluentd_versions: ["3_5", "3_6", "3_7"] __allowed_fluentd_types: ["hosted", "secure-aggregator", "secure-host"] __allowed_mux_client_modes: ["minimal", "maximal"] diff --git a/roles/openshift_logging_kibana/vars/main.yml b/roles/openshift_logging_kibana/vars/main.yml index 87b281c4b..241877a02 100644 --- a/roles/openshift_logging_kibana/vars/main.yml +++ b/roles/openshift_logging_kibana/vars/main.yml @@ -1,3 +1,3 @@ --- -__latest_kibana_version: "3_5" -__allowed_kibana_versions: ["3_5", "3_6"] +__latest_kibana_version: "3_6" +__allowed_kibana_versions: ["3_5", "3_6", "3_7"] diff --git a/roles/openshift_logging_mux/vars/main.yml b/roles/openshift_logging_mux/vars/main.yml index 4234b74e2..e7b57f4b5 100644 --- a/roles/openshift_logging_mux/vars/main.yml +++ b/roles/openshift_logging_mux/vars/main.yml @@ -1,3 +1,3 @@ --- -__latest_mux_version: "3_5" -__allowed_mux_versions: ["3_5", "3_6"] +__latest_mux_version: "3_6" +__allowed_mux_versions: ["3_5", "3_6", "3_7"] |