Update

Signed-off-by: Jan Lieskovsky <[email protected]>

Author: Jan Lieskovsky

os-sso72/added/openshift-launch.sh

@@ -15,7 +15,7 @@ function clean_shutdown() {
 function wait_for_service() {
   local -r curl_conn_refused_exit_code="7"
   if [ -n "${SERVICE_WAIT_NAME}" ]; then
-    local -r connect_retry_message="${SERVICE_WAIT_MESSAGE:-"Waiting for the \"${SERVICE_WAIT_NAME}\" service to become available ..."}"
+    local -r connect_retry_message="${SERVICE_WAIT_RETRY_MESSAGE:-"Waiting for the \"${SERVICE_WAIT_NAME}\" service to become available ..."}"
     local service="${SERVICE_WAIT_NAME/-/_}"
     local -r service_host="${service^^}_SERVICE_HOST"
     local -r service_port="${service^^}_SERVICE_PORT"
@@ -27,9 +27,9 @@ function wait_for_service() {
       log_warning "Unable to determine target host or port of the \"${SERVICE_WAIT_NAME}\" service. The RH-SSO pod will start without waiting the \"${SERVICE_WAIT_NAME}\" service to be reachable over network. Please make sure you specified correct service name in SERVICE_WAIT_NAME"
     else
       until ( echo > /dev/tcp/"${!service_host}"/"${!service_port}" ) &> /dev/null; do
-        if [ -n "${SERVICE_WAIT_CLAIM_MESSAGE}" ]; then
-          log_warning "${SERVICE_WAIT_CLAIM_MESSAGE}"
-          unset SERVICE_WAIT_CLAIM_MESSAGE
+        if [ -n "${SERVICE_WAIT_INTRO_MESSAGE}" ]; then
+          log_warning "${SERVICE_WAIT_INTRO_MESSAGE}"
+          unset SERVICE_WAIT_INTRO_MESSAGE
         fi
           log_info "${connect_retry_message}"
           sleep "${SERVICE_WAIT_RETRY_PERIOD_SECONDS:-10}s"

os-sso72/module.yaml

@@ -23,3 +23,27 @@ run:
       user: 185
       cmd:
           - "/opt/eap/bin/openshift-launch.sh"
+
+envs:
+    - name: "SERVICE_WAIT_NAME"
+      example: "sso-mysql"
+      description: "Name of the OpenShift service, the RH-SSO pod should wait for to become reachable over network, prior starting the RH-SSO server. Not set by default."
+    - name: "SERVICE_WAIT_RETRY_MESSAGE"
+      example: "Waiting for the \"${SERVICE_WAIT_NAME}\" service to become available ..."
+      description: "Message to be displayed in connect-retry loop, in which the RH-SSO pod is waiting for the SERVICE_WAIT_NAME to become reachable over network. Not set by default."
+    - name: "SERVICE_WAIT_INTRO_MESSAGE"
+      example: "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-mysql-claim\" or a storage class is set."
+      description: "Message to be displayed prior starting the connect-retry loop, in which the RH-SSO pod is waiting for the SERVICE_WAIT_NAME to become reachable over network. Typically describes additional requirements in order the connect-retry loop of the RH-SSO pod successfully to finish. Not set by default."
+    - name: "SSO_ADMIN_USERNAME"
+      example: "admin"
+      description: "Username of the administrator account for the 'master' realm of the RH-SSO server. Required. If no value is specified, it is auto generated and displayed as an OpenShift Instructional message when the template is instantiated."
+    - name: "SSO_ADMIN_PASSWORD"
+      example: "hardtoguess"
+      description: "Password of the administrator account for the 'master' realm of the RH-SSO server. Required. If no value is specified, it is auto generated and displayed as an OpenShift Instructional message when the template is instantiated."
+    - name: "SSO_SERVICE_USERNAME"
+      example: "username"
+      description: "RH-SSO Server service username with rights to create Client configurations in SSO_REALM. This user is created if this ENV is provided"
+    - name: "SSO_SERVICE_PASSWORD"
+      example: "password"
+      description: "Password for SSO_SERVICE_USERNAME"
+