summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-23 16:59:33 -0500
committerGitHub <noreply@github.com>2017-01-23 16:59:33 -0500
commitc2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (patch)
tree15e2ee2c70da545a52a840ba2ac378ebc1c8da79
parentc24aec308f515dd7a1ae09d35cd95617530615b9 (diff)
parent92f1cf87eb20254d9da77306aa598506000b159b (diff)
downloadopenshift-c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d.tar.gz
openshift-c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d.tar.bz2
openshift-c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d.tar.xz
openshift-c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d.zip
Merge pull request #3151 from jcantrill/bz_1414625_require_httpd_tools
fixes BZ-1414625. Check for httpd-tools and java before install
-rw-r--r--openshift-ansible.spec1
-rw-r--r--roles/openshift_metrics/README.md4
-rw-r--r--roles/openshift_metrics/tasks/install_support.yaml18
3 files changed, 23 insertions, 0 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index a2940e001..ebb555032 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -18,6 +18,7 @@ Requires: python2
Requires: python-six
Requires: tar
Requires: openshift-ansible-docs = %{version}-%{release}
+Requires: httpd-tools
%description
Openshift and Atomic Enterprise Ansible
diff --git a/roles/openshift_metrics/README.md b/roles/openshift_metrics/README.md
index 0f287e944..a61b0db5e 100644
--- a/roles/openshift_metrics/README.md
+++ b/roles/openshift_metrics/README.md
@@ -5,6 +5,10 @@ OpenShift Metrics Installation
Requirements
------------
+This role has the following dependencies:
+
+- Java is required on the control node to generate keystores for the Java components
+- httpd-tools is required on the control node to generate various passwords for the metrics components
The following variables need to be set and will be validated:
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