You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Move description of environment variables specific to os-sso72 module
to appropriate module.yaml file
Signed-off-by: Jan Lieskovsky <[email protected]>
Copy file name to clipboardExpand all lines: os-sso72/added/openshift-launch.sh
+31Lines changed: 31 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -11,11 +11,40 @@ function clean_shutdown() {
11
11
wait$!
12
12
}
13
13
14
+
# CLOUD-2453 Connect-retry loop to wait for the service to become reachable over network
15
+
functionwait_for_service() {
16
+
local -r curl_conn_refused_exit_code="7"
17
+
if [ -n"${SERVICE_WAIT_NAME}" ];then
18
+
local -r connect_retry_message="${SERVICE_WAIT_RETRY_MESSAGE:-"Waiting for the \"${SERVICE_WAIT_NAME}\" service to become available ..."}"
19
+
local service="${SERVICE_WAIT_NAME/-/_}"
20
+
local -r service_host="${service^^}_SERVICE_HOST"
21
+
local -r service_port="${service^^}_SERVICE_PORT"
22
+
if [ -n"${SERVICE_WAIT_RETRY_PERIOD_SECONDS}" ] && [[ !"${SERVICE_WAIT_RETRY_PERIOD_SECONDS}"=~'^[0-9]+\.?[0-9]*$' ]];then
23
+
log_warning "Value of SERVICE_WAIT_RETRY_PERIOD_SECONDS variable can be only arbitrary floating point number. Ignoring \"${SERVICE_WAIT_RETRY_PERIOD_SECONDS}\" setting, defaulting to 10 seconds."
24
+
unset SERVICE_WAIT_RETRY_PERIOD_SECONDS
25
+
fi
26
+
if [ -z"${!service_host}"-o-z"${!service_port}" ];then
27
+
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"
28
+
else
29
+
until ( echo> /dev/tcp/"${!service_host}"/"${!service_port}" ) &> /dev/null;do
30
+
if [ -n"${SERVICE_WAIT_INTRO_MESSAGE}" ];then
31
+
log_warning "${SERVICE_WAIT_INTRO_MESSAGE}"
32
+
unset SERVICE_WAIT_INTRO_MESSAGE
33
+
fi
34
+
log_info "${connect_retry_message}"
35
+
sleep "${SERVICE_WAIT_RETRY_PERIOD_SECONDS:-10}s"
36
+
done
37
+
fi
38
+
fi
39
+
}
40
+
14
41
functionrunServer() {
15
42
local instanceDir=$1
16
43
local count=$2
17
44
export NODE_NAME="${NODE_NAME:-node}-${count}"
18
45
46
+
wait_for_service
47
+
19
48
source$JBOSS_HOME/bin/launch/configure.sh
20
49
21
50
log_info "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
@@ -47,6 +76,8 @@ if [ "${SPLIT_DATA^^}" = "TRUE" ]; then
Copy file name to clipboardExpand all lines: os-sso72/module.yaml
+24Lines changed: 24 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -23,3 +23,27 @@ run:
23
23
user: 185
24
24
cmd:
25
25
- "/opt/eap/bin/openshift-launch.sh"
26
+
27
+
envs:
28
+
- name: "SERVICE_WAIT_NAME"
29
+
example: "sso-mysql"
30
+
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."
31
+
- name: "SERVICE_WAIT_RETRY_MESSAGE"
32
+
example: "Waiting for the \"${SERVICE_WAIT_NAME}\" service to become available ..."
33
+
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."
34
+
- name: "SERVICE_WAIT_INTRO_MESSAGE"
35
+
example: "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-mysql-claim\" or a storage class is set."
36
+
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."
37
+
- name: "SSO_ADMIN_USERNAME"
38
+
example: "admin"
39
+
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."
40
+
- name: "SSO_ADMIN_PASSWORD"
41
+
example: "hardtoguess"
42
+
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."
43
+
- name: "SSO_SERVICE_USERNAME"
44
+
example: "username"
45
+
description: "RH-SSO Server service username with rights to create Client configurations in SSO_REALM. This user is created if this ENV is provided"
0 commit comments