diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-10-13 11:55:11 -0500 |
---|---|---|
committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-10-13 11:55:11 -0500 |
commit | ce2d03c7d007aae4a1560012642e09cd51218124 (patch) | |
tree | 7b4ecb148233530ca5c172a4611f9d1a7d22ee75 /roles/openshift_logging_elasticsearch/defaults | |
parent | e3c8b0065af5c7ecfc3746e65620ba7db0ebcf0e (diff) | |
download | openshift-ce2d03c7d007aae4a1560012642e09cd51218124.tar.gz openshift-ce2d03c7d007aae4a1560012642e09cd51218124.tar.bz2 openshift-ce2d03c7d007aae4a1560012642e09cd51218124.tar.xz openshift-ce2d03c7d007aae4a1560012642e09cd51218124.zip |
Updating ES proxy image prefix and version to match other components
Diffstat (limited to 'roles/openshift_logging_elasticsearch/defaults')
-rw-r--r-- | roles/openshift_logging_elasticsearch/defaults/main.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml index 554aa5bb2..08d7626c4 100644 --- a/roles/openshift_logging_elasticsearch/defaults/main.yml +++ b/roles/openshift_logging_elasticsearch/defaults/main.yml @@ -40,8 +40,9 @@ openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_ # config the es plugin to write kibana index based on the index mode openshift_logging_elasticsearch_kibana_index_mode: 'unique' -openshift_logging_elasticsearch_proxy_image_prefix: "openshift/oauth-proxy" -openshift_logging_elasticsearch_proxy_image_version: "v1.0.0" +openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_image_prefix | default(__openshift_logging_image_prefix) }}" +openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_image_version | default('latest') }}" +#openshift_logging_elasticsearch_proxy_image_version: "v1.0.0" openshift_logging_elasticsearch_proxy_cpu_limit: "100m" openshift_logging_elasticsearch_proxy_memory_limit: "64Mi" openshift_logging_elasticsearch_prometheus_sa: "system:serviceaccount:{{openshift_prometheus_namespace | default('prometheus')}}:prometheus" |