diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-01-23 16:08:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:08:20 -0600 |
| commit | 066494438d5baff9f555cd56a8bde94df148dc31 (patch) | |
| tree | e0c802a5af8dc07f0a16b5d41ebea55de4a34d06 /roles/openshift_metrics/tasks | |
| parent | d740fd159416783c88839e6e2c2e150eb81b67da (diff) | |
| parent | c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (diff) | |
| download | openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.gz openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.bz2 openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.xz openshift-066494438d5baff9f555cd56a8bde94df148dc31.zip | |
Merge branch 'master' into fix_logging_jks_gen
Diffstat (limited to 'roles/openshift_metrics/tasks')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_metrics.yaml | 16 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_support.yaml | 18 |
2 files changed, 30 insertions, 4 deletions
diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml index bab37dbfb..ddaa54438 100644 --- a/roles/openshift_metrics/tasks/install_metrics.yaml +++ b/roles/openshift_metrics/tasks/install_metrics.yaml @@ -20,15 +20,23 @@ loop_control: loop_var: include_file +- find: paths={{ mktemp.stdout }}/templates patterns=*.yaml + register: object_def_files + changed_when: no + +- slurp: src={{item.path}} + register: object_defs + with_items: "{{object_def_files.files}}" + changed_when: no + - name: Create objects include: oc_apply.yaml vars: kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig" namespace: "{{ openshift_metrics_project }}" - file_name: "{{ item }}" - file_content: "{{ lookup('file',item) | from_yaml }}" - with_fileglob: - - "{{ mktemp.stdout }}/templates/*.yaml" + file_name: "{{ item.source }}" + file_content: "{{ item.content | b64decode | from_yaml }}" + with_items: "{{ object_defs.results }}" - name: Scaling up cluster include: start_metrics.yaml diff --git a/roles/openshift_metrics/tasks/install_support.yaml b/roles/openshift_metrics/tasks/install_support.yaml index b0e4bec80..cc5acc6e5 100644 --- a/roles/openshift_metrics/tasks/install_support.yaml +++ b/roles/openshift_metrics/tasks/install_support.yaml @@ -1,4 +1,22 @@ --- +- name: Check control node to see if htpasswd is installed + local_action: command which htpasswd + register: htpasswd_check + failed_when: no + changed_when: no + +- fail: msg="'htpasswd' is unavailable. Please install httpd-tools on the control node" + when: htpasswd_check.rc == 1 + +- name: Check control node to see if keytool is installed + local_action: command which htpasswd + register: keytool_check + failed_when: no + changed_when: no + +- fail: msg="'keytool' is unavailable. Please install java-1.8.0-openjdk-headless on the control node" + when: keytool_check.rc == 1 + - include: generate_certificates.yaml - include: generate_serviceaccounts.yaml - include: generate_services.yaml |