diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-05 13:26:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 13:26:55 -0500 |
| commit | 03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb (patch) | |
| tree | 4f832c169d00cd8962333c29096753cb6e322b19 /roles/openshift_logging_kibana | |
| parent | e64cc7d416e8121dcda25be05da9ec3c5b6899eb (diff) | |
| parent | 0de559c8f2fd310fe36047ae000574229b7858c9 (diff) | |
| download | openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.tar.gz openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.tar.bz2 openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.tar.xz openshift-03f5d8249478ca5e62eb3d5db7aa1b7a43de96eb.zip | |
Merge pull request #6306 from mgugino-upstream-stage/fix-hosted-vars
Fix hosted vars
Diffstat (limited to 'roles/openshift_logging_kibana')
| -rw-r--r-- | roles/openshift_logging_kibana/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_kibana/meta/main.yaml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_logging_kibana/defaults/main.yml b/roles/openshift_logging_kibana/defaults/main.yml index 6cdf7c8f3..007089e00 100644 --- a/roles/openshift_logging_kibana/defaults/main.yml +++ b/roles/openshift_logging_kibana/defaults/main.yml @@ -10,7 +10,7 @@ openshift_logging_kibana_cpu_limit: null openshift_logging_kibana_cpu_request: 100m openshift_logging_kibana_memory_limit: 736Mi -openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}" +openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ openshift_master_default_subdomain }}" openshift_logging_kibana_es_host: "logging-es" openshift_logging_kibana_es_port: 9200 diff --git a/roles/openshift_logging_kibana/meta/main.yaml b/roles/openshift_logging_kibana/meta/main.yaml index 89e08abc0..d97586a37 100644 --- a/roles/openshift_logging_kibana/meta/main.yaml +++ b/roles/openshift_logging_kibana/meta/main.yaml @@ -13,3 +13,4 @@ galaxy_info: - cloud dependencies: - role: lib_openshift +- role: openshift_facts |