diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-02 12:01:03 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-09-26 13:33:47 -0400 |
| commit | 3973df126d393f40e9d7e3ff947149119aed5953 (patch) | |
| tree | e69e04aea4f2350d6caed2356e6b743732de1e0f | |
| parent | cb566b897d7ef55bf839a93a086b61da20ca9d20 (diff) | |
| download | openshift-3973df126d393f40e9d7e3ff947149119aed5953.tar.gz openshift-3973df126d393f40e9d7e3ff947149119aed5953.tar.bz2 openshift-3973df126d393f40e9d7e3ff947149119aed5953.tar.xz openshift-3973df126d393f40e9d7e3ff947149119aed5953.zip | |
Rename openshift_hosted_logging_image_{prefix,version} to match metrics
| -rw-r--r-- | roles/openshift_hosted_logging/vars/main.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_hosted_logging/vars/main.yaml b/roles/openshift_hosted_logging/vars/main.yaml index 2ef3164e1..da06f06f4 100644 --- a/roles/openshift_hosted_logging/vars/main.yaml +++ b/roles/openshift_hosted_logging/vars/main.yaml @@ -1,6 +1,6 @@ -tr_or_ohlip: "{{ openshift_hosted_logging_image_prefix or target_registry or none }}" -ip_kv: "{{ '-p IMAGE_PREFIX=' ~ tr_or_ohlip | quote if tr_or_ohlip is defined else '' }}" -iv_kv: "{{ '-p IMAGE_VERSION=' ~ openshift_hosted_logging_image_version | quote if openshift_hosted_logging_image_version is defined else '' }}" +tr_or_ohlip: "{{ openshift_hosted_logging_deployer_prefix | default(target_registry) | default(None) }}" +ip_kv: "{{ '-p IMAGE_PREFIX=' ~ tr_or_ohlip | quote if tr_or_ohlip != '' else '' }}" +iv_kv: "{{ '-p IMAGE_VERSION=' ~ openshift_hosted_logging_deployer_version | quote if openshift_hosted_logging_deployer_version is defined else '' }}" oc_new_app_values: "{{ ip_kv }} {{ iv_kv }}" openshift_master_config_dir: "{{ openshift.common.config_base }}/master" kh_cmap_param: "{{ '--from-literal kibana-hostname=' ~ openshift_hosted_logging_hostname | quote if openshift_hosted_logging_hostname is defined else '' }}" |