diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-15 20:08:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 20:08:06 -0800 |
| commit | 9df909053978f515ace83626755a78c163357ba2 (patch) | |
| tree | 925a069ddb7bde3ad7422a85f8cb505c4eafd246 /roles/openshift_logging_mux/defaults | |
| parent | 6cfc4a162cff36bb2ba7bb482135060e76c5d5a1 (diff) | |
| parent | aea3fa16ecf72ea5657fa95d96558a7ebde9f66e (diff) | |
| download | openshift-9df909053978f515ace83626755a78c163357ba2.tar.gz openshift-9df909053978f515ace83626755a78c163357ba2.tar.bz2 openshift-9df909053978f515ace83626755a78c163357ba2.tar.xz openshift-9df909053978f515ace83626755a78c163357ba2.zip | |
Merge pull request #6037 from ewolinetz/logging_default_images
Automatic merge from submit-queue.
Updating logging components image defaulting pattern
Matches openshift_logging pattern and pattern used by other ansible components
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=1505681
Diffstat (limited to 'roles/openshift_logging_mux/defaults')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 9de686576..cd15da939 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -1,7 +1,5 @@ --- ### General logging settings -openshift_logging_mux_image_prefix: "{{ openshift_logging_image_prefix | default(__openshift_logging_image_prefix) }}" -openshift_logging_mux_image_version: "{{ openshift_logging_image_version | default('latest') }}" openshift_logging_mux_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}" openshift_logging_mux_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}" openshift_logging_mux_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' ~ (openshift_master_api_port | default('8443', true))) }}" |