summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-06 16:26:29 -0500
committerGitHub <noreply@github.com>2017-02-06 16:26:29 -0500
commit41ff6013a19c77fdc35adcf58ad523069f20ee2f (patch)
tree5e111d8651ac4bbf8ed979ee90c973ae6496f056 /playbooks/adhoc
parent5c40085f671cd1c0d21303304be7346e91a54248 (diff)
parentb53e69588296800998f2256d66a74080ebc1e4f1 (diff)
downloadopenshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.gz
openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.bz2
openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.xz
openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.zip
Merge pull request #3257 from jcantrill/bz1417261_deployer_with_35
fixes 1417261. Points playbooks to the correct 3.5 roles for logging …
Diffstat (limited to 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/openshift_hosted_logging_efk.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/adhoc/openshift_hosted_logging_efk.yaml b/playbooks/adhoc/openshift_hosted_logging_efk.yaml
index 0b30a221d..e83351272 100644
--- a/playbooks/adhoc/openshift_hosted_logging_efk.yaml
+++ b/playbooks/adhoc/openshift_hosted_logging_efk.yaml
@@ -1,7 +1,7 @@
---
- hosts: masters[0]
roles:
- - role: openshift_hosted_logging
+ - role: openshift_logging
openshift_hosted_logging_cleanup: no
- name: Update master-config for publicLoggingURL
@@ -11,6 +11,6 @@
logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
tasks:
- include_role:
- name: openshift_hosted_logging
+ name: openshift_logging
tasks_from: update_master_config
when: openshift_hosted_logging_deploy | default(false) | bool