diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-02 12:01:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 12:01:20 -0800 |
| commit | a327ab37e12f71625d3a4b0714c726dc5ac5f942 (patch) | |
| tree | a5d6c0bac54f4d827442d041868a211d90d54136 | |
| parent | eb43e2b79ed34dca04bff5522190ff7735814a7a (diff) | |
| parent | 6e7b7448e0b9d88d649b3ae70c1e91b06ad7d97e (diff) | |
| download | openshift-a327ab37e12f71625d3a4b0714c726dc5ac5f942.tar.gz openshift-a327ab37e12f71625d3a4b0714c726dc5ac5f942.tar.bz2 openshift-a327ab37e12f71625d3a4b0714c726dc5ac5f942.tar.xz openshift-a327ab37e12f71625d3a4b0714c726dc5ac5f942.zip | |
Merge pull request #6523 from nhosoi/allowed_versions
Automatic merge from submit-queue.
Bug 1527178 - installation of logging stack failed: Invalid version s…
…pecified for Elasticsearch
openshift_logging_{curator,elasicsearch,fluentd,kibana,mux}/vars/main.yml:
- adding "3_8" to __allowed_.*_versions
- replacing the value of __latest_.*_version "3_6" with "3_8".
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1527178
| -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 95bf462d1..5bee58725 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_6" -__allowed_curator_versions: ["3_5", "3_6", "3_7"] +__latest_curator_version: "3_8" +__allowed_curator_versions: ["3_5", "3_6", "3_7", "3_8"] diff --git a/roles/openshift_logging_elasticsearch/vars/main.yml b/roles/openshift_logging_elasticsearch/vars/main.yml index c8e995146..0e56a6eac 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_6" -__allowed_es_versions: ["3_5", "3_6", "3_7"] +__latest_es_version: "3_8" +__allowed_es_versions: ["3_5", "3_6", "3_7", "3_8"] __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 92a426952..762e3d4d0 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_6" -__allowed_fluentd_versions: ["3_5", "3_6", "3_7"] +__latest_fluentd_version: "3_8" +__allowed_fluentd_versions: ["3_5", "3_6", "3_7", "3_8"] __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 241877a02..a2c54d8e4 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_6" -__allowed_kibana_versions: ["3_5", "3_6", "3_7"] +__latest_kibana_version: "3_8" +__allowed_kibana_versions: ["3_5", "3_6", "3_7", "3_8"] diff --git a/roles/openshift_logging_mux/vars/main.yml b/roles/openshift_logging_mux/vars/main.yml index e7b57f4b5..1da053b4a 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_6" -__allowed_mux_versions: ["3_5", "3_6", "3_7"] +__latest_mux_version: "3_8" +__allowed_mux_versions: ["3_5", "3_6", "3_7", "3_8"] |