diff options
| author | Stéphane Klein <contact@stephane-klein.info> | 2016-09-08 13:59:15 +0200 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-09-26 13:58:51 -0400 |
| commit | 3006f38ed72af416e6b103319c59c9fee28d9e65 (patch) | |
| tree | 09e3788c9676f4fa6ee9dfff21fa3d42f566e5df /roles/openshift_hosted_logging | |
| parent | cee544cbaf8d8353658d4859897d2533a566b04e (diff) | |
| download | openshift-3006f38ed72af416e6b103319c59c9fee28d9e65.tar.gz openshift-3006f38ed72af416e6b103319c59c9fee28d9e65.tar.bz2 openshift-3006f38ed72af416e6b103319c59c9fee28d9e65.tar.xz openshift-3006f38ed72af416e6b103319c59c9fee28d9e65.zip | |
Fix some bugs in OpenShift Hosted Logging role
* Fix bug: now create templates for logging accounts and the deployer use {{ examples_base }} variable
Diffstat (limited to 'roles/openshift_hosted_logging')
| -rw-r--r-- | roles/openshift_hosted_logging/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_hosted_logging/tasks/deploy_logging.yaml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_hosted_logging/defaults/main.yml b/roles/openshift_hosted_logging/defaults/main.yml new file mode 100644 index 000000000..e357899e5 --- /dev/null +++ b/roles/openshift_hosted_logging/defaults/main.yml @@ -0,0 +1,2 @@ +--- +examples_base: "{{ openshift.common.config_base if openshift.common.is_containerized | bool else '/usr/share/openshift' }}/examples" diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml index 44c202b0b..ee9cd308c 100644 --- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml +++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml @@ -40,7 +40,7 @@ - name: "Create templates for logging accounts and the deployer" command: > - {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig create -f /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml + {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig create -f {{ examples_base }}/infrastructure-templates/{{ 'enterprise' if openshift_deployment_type == 'openshift-enterprise' else 'origin' }}/logging-deployer.yaml register: template_output failed_when: "template_output.rc == 1 and 'exists' not in template_output.stderr" |