diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-25 19:46:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-25 19:46:36 -0400 |
| commit | 8733598a980b098df855ceb27101ac68ec94c436 (patch) | |
| tree | d3d70f1e840cd50fe19d0a191209d448b5f291cc /roles/openshift_logging_mux | |
| parent | d2a5ceae371fcb06afd12ca422d4c6e6aab126b2 (diff) | |
| parent | 00e7908e983f97ab31360aeff32824f52fd25efd (diff) | |
| download | openshift-8733598a980b098df855ceb27101ac68ec94c436.tar.gz openshift-8733598a980b098df855ceb27101ac68ec94c436.tar.bz2 openshift-8733598a980b098df855ceb27101ac68ec94c436.tar.xz openshift-8733598a980b098df855ceb27101ac68ec94c436.zip | |
Merge pull request #5044 from wozniakjan/logging_role_based_image_versions
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_mux')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/tasks/main.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 7a3da9b4c..68412aec8 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -1,7 +1,7 @@ --- ### General logging settings -openshift_logging_mux_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | default('docker.io/openshift/origin-') }}" -openshift_logging_mux_image_version: "{{ openshift_hosted_logging_deployer_version | default('latest') }}" +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))) }}" diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml index 8ec93de7d..2ec863afa 100644 --- a/roles/openshift_logging_mux/tasks/main.yaml +++ b/roles/openshift_logging_mux/tasks/main.yaml @@ -165,7 +165,7 @@ component: mux logging_component: mux deploy_name: "logging-{{ component }}" - image: "{{ openshift_logging_image_prefix }}logging-fluentd:{{ openshift_logging_image_version }}" + image: "{{ openshift_logging_mux_image_prefix }}logging-fluentd:{{ openshift_logging_mux_image_version }}" es_host: "{{ openshift_logging_mux_app_host }}" es_port: "{{ openshift_logging_mux_app_port }}" ops_host: "{{ openshift_logging_mux_ops_host }}" |