Rebase from target
This commit is contained in:
commit
03a15bdec5
@ -85,6 +85,14 @@ function config_changed {
|
||||
set_or_update LOGIN_URL "$web_root/auth/login"
|
||||
set_or_update LOGIN_REDIRECT_URL "$web_root"
|
||||
|
||||
# Save our scriptrc env variables for health checks
|
||||
declare -a env_vars=(
|
||||
'OPENSTACK_URL_HORIZON="http://localhost'$web_root'|Login+-+OpenStack"'
|
||||
'OPENSTACK_SERVICE_HORIZON=apache2'
|
||||
'OPENSTACK_PORT_HORIZON=80')
|
||||
save_script_rc ${env_vars[@]}
|
||||
|
||||
|
||||
# Set default role and trigger a identity-service relation event to
|
||||
# ensure role is created in keystone.
|
||||
set_or_update OPENSTACK_KEYSTONE_DEFAULT_ROLE "$(config-get default-role)"
|
||||
|
2
scripts/add_to_cluster
Executable file
2
scripts/add_to_cluster
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
crm node online
|
13
scripts/health_checks.d/service_ports_live
Executable file
13
scripts/health_checks.d/service_ports_live
Executable file
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
# Validate that service ports are active
|
||||
HEALTH_DIR=`dirname $0`
|
||||
SCRIPTS_DIR=`dirname $HEALTH_DIR`
|
||||
. $SCRIPTS_DIR/scriptrc
|
||||
set -e
|
||||
|
||||
# Grab any OPENSTACK_PORT* environment variables
|
||||
openstack_ports=`env| awk -F '=' '(/OPENSTACK_PORT/){print $2}'`
|
||||
for port in $openstack_ports
|
||||
do
|
||||
netstat -ln | grep -q ":$port "
|
||||
done
|
13
scripts/health_checks.d/service_running
Executable file
13
scripts/health_checks.d/service_running
Executable file
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
# Validate that service is running
|
||||
HEALTH_DIR=`dirname $0`
|
||||
SCRIPTS_DIR=`dirname $HEALTH_DIR`
|
||||
. $SCRIPTS_DIR/scriptrc
|
||||
set -e
|
||||
|
||||
# Grab any OPENSTACK_SERVICE* environment variables
|
||||
openstack_service_names=`env| awk -F '=' '(/OPENSTACK_SERVICE/){print $2}'`
|
||||
for service_name in $openstack_service_names
|
||||
do
|
||||
service $service_name status 2>/dev/null | grep -q running
|
||||
done
|
16
scripts/health_checks.d/service_url_checks
Executable file
16
scripts/health_checks.d/service_url_checks
Executable file
@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
# Validate that service urls return expected content
|
||||
HEALTH_DIR=`dirname $0`
|
||||
SCRIPTS_DIR=`dirname $HEALTH_DIR`
|
||||
. $SCRIPTS_DIR/scriptrc
|
||||
set -e
|
||||
|
||||
# Grab any OPENSTACK_URL* environment variables and validate content response
|
||||
openstack_urls=`env| awk -F '=' '(/OPENSTACK_URL/){print $2 }'`
|
||||
for url_check in $openstack_urls
|
||||
do
|
||||
url=`echo $url_check| awk -F '|' '{print $1}'`
|
||||
expected_content=`echo $url_check| awk -F '|' '{print $2}'`
|
||||
wget -q -O - $url | grep -q "${expected_content//+/ }"
|
||||
done
|
||||
|
2
scripts/remove_from_cluster
Executable file
2
scripts/remove_from_cluster
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
crm node standby
|
Loading…
Reference in New Issue
Block a user