summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-16 15:38:12 -0400
committerGitHub <noreply@github.com>2017-03-16 15:38:12 -0400
commite42f0fb9258a87046ded4a25ade90b9d9ddb17ba (patch)
tree726fab18c60f44db549a978e84cfaebf73706b03
parenta4c8b2d019756cbba01d9d2f41add3926c21fb8d (diff)
parentd2f46d8494b18a7f734e42187b2f264616ee16ba (diff)
downloadopenshift-e42f0fb9258a87046ded4a25ade90b9d9ddb17ba.tar.gz
openshift-e42f0fb9258a87046ded4a25ade90b9d9ddb17ba.tar.bz2
openshift-e42f0fb9258a87046ded4a25ade90b9d9ddb17ba.tar.xz
openshift-e42f0fb9258a87046ded4a25ade90b9d9ddb17ba.zip
Merge pull request #3669 from ewolinetz/logging_master_api_port
Removing dependency on master facts for master_public_url default
-rw-r--r--roles/openshift_logging/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml
index f433ee891..04fd42cbf 100644
--- a/roles/openshift_logging/defaults/main.yml
+++ b/roles/openshift_logging/defaults/main.yml
@@ -3,7 +3,7 @@ openshift_logging_image_prefix: "{{ openshift_hosted_logging_deployer_prefix | d
openshift_logging_image_version: "{{ openshift_hosted_logging_deployer_version | default('latest') }}"
openshift_logging_use_ops: "{{ openshift_hosted_logging_enable_ops_cluster | default('false') | bool }}"
openshift_logging_master_url: "https://kubernetes.default.svc.{{ openshift.common.dns_domain }}"
-openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' + openshift.master.api_port) }}"
+openshift_logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default('https://' + openshift.common.public_hostname + ':' ~ (openshift_master_api_port | default('8443', true))) }}"
openshift_logging_namespace: logging
openshift_logging_install_logging: True
openshift_logging_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"