From 07d87406eeb22e89b63f8baf153d8c2b328ca452 Mon Sep 17 00:00:00 2001 From: Jack Ding Date: Sat, 14 Jul 2018 10:27:09 -0400 Subject: [PATCH] Add dcorch-identity-api-proxy ocf script Add dcorch-identity-api-proxy ocf script as part of Distributed Keystone for Distributed Cloud feature. Story: 2002842 Task: 22785 Change-Id: Icd215916e27db785af145c68c72d13abdaf577ba Signed-off-by: Jack Ding --- .../openstack-ras/centos/build_srpm.data | 2 +- .../centos/files/dcorch-identity-api-proxy | 327 ++++++++++++++++++ .../openstack-ras/centos/openstack-ras.spec | 5 +- 3 files changed, 332 insertions(+), 2 deletions(-) create mode 100644 openstack/openstack-ras/centos/files/dcorch-identity-api-proxy diff --git a/openstack/openstack-ras/centos/build_srpm.data b/openstack/openstack-ras/centos/build_srpm.data index 7ef213dc..b977484e 100644 --- a/openstack/openstack-ras/centos/build_srpm.data +++ b/openstack/openstack-ras/centos/build_srpm.data @@ -1,5 +1,5 @@ SRC_DIR="$CGCS_BASE/git/openstack-ras" -#COPY_LIST="$FILES_BASE/*" +COPY_LIST="$FILES_BASE/*" TIS_BASE_SRCREV=fe339af22d62454dca5a4f1ca071c958bfcd950d TIS_PATCH_VER=GITREVCOUNT diff --git a/openstack/openstack-ras/centos/files/dcorch-identity-api-proxy b/openstack/openstack-ras/centos/files/dcorch-identity-api-proxy new file mode 100644 index 00000000..e38f22ba --- /dev/null +++ b/openstack/openstack-ras/centos/files/dcorch-identity-api-proxy @@ -0,0 +1,327 @@ +#!/bin/sh +# OpenStack DC Orchestrator Identity Api Proxy Service (dcorch-identity-api-proxy) +# +# Description: +# Manages an OpenStack DC Orchestrator Identity Api Proxy Service (dcorch-identity-api-proxy) +# process as an HA resource +# +# +# Copyright (c) 2018 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# +# See usage() function below for more details ... +# +# OCF instance parameters: +# OCF_RESKEY_binary +# OCF_RESKEY_config +# OCF_RESKEY_user +# OCF_RESKEY_pid +# OCF_RESKEY_additional_parameters +####################################################################### +# Initialization: + +: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} +. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs + +####################################################################### + +# Fill in some defaults if no values are specified + +OCF_RESKEY_binary_default="/usr/bin/dcorch-api-proxy" +OCF_RESKEY_config_default="/etc/dcorch/dcorch.conf" +OCF_RESKEY_user_default="dcorch" +OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid" + +: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} +: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} +: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} +: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}} + +####################################################################### + +usage() { + cat < + + +1.0 + + +Resource agent for the DC Orchestrator Identity Api proxy service (dcorch-identity-api-proxy) + +Manages the OpenStack DC Orchestrator Identity Api Proxy Service (dcorch-identity-api-proxy) + + + + +Location of the DC Orchestrator Identity Api proxy server binary (dcorch-identity-api-proxy) + +DC Orchestrator Identity Api proxy server binary (dcorch-identity-api-proxy) + + + + + +Location of the DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) configuration file + +DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy registry) config file + + + + + +User running DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) + +DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) user + + + + + +The pid file to use for this DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) instance + +DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) pid file + + + + + +Additional parameters to pass on to the OpenStack identity API (dcorch-identity-api-proxy) + +Additional parameters for dcorch-identity-api-proxy + + + + + + + + + + + + + + +END +} + +####################################################################### +# Functions invoked by resource manager actions + +dcorch_identity_api_proxy_validate() { + local rc + + check_binary $OCF_RESKEY_binary + check_binary curl + check_binary tr + check_binary grep + check_binary cut + check_binary head + + # A config file on shared storage that is not available + # during probes is OK. + if [ ! -f $OCF_RESKEY_config ]; then + if ! ocf_is_probe; then + ocf_log err "Config $OCF_RESKEY_config doesn't exist" + return $OCF_ERR_INSTALLED + fi + ocf_log_warn "Config $OCF_RESKEY_config not available during a probe" + fi + + getent passwd $OCF_RESKEY_user >/dev/null 2>&1 + rc=$? + if [ $rc -ne 0 ]; then + ocf_log err "User $OCF_RESKEY_user doesn't exist" + return $OCF_ERR_INSTALLED + fi + + true +} + +dcorch_identity_api_proxy_status() { + local pid + local rc + + if [ ! -f $OCF_RESKEY_pid ]; then + ocf_log info "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) is not running" + return $OCF_NOT_RUNNING + else + pid=`cat $OCF_RESKEY_pid` + fi + + ocf_run -warn kill -s 0 $pid + rc=$? + if [ $rc -eq 0 ]; then + return $OCF_SUCCESS + else + ocf_log info "Old PID file found, but DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) is not running" + rm -f $OCF_RESKEY_pid + return $OCF_NOT_RUNNING + fi +} + +dcorch_identity_api_proxy_monitor() { + local rc + + dcorch_identity_api_proxy_status + rc=$? + + # If status returned anything but success, return that immediately + if [ $rc -ne $OCF_SUCCESS ]; then + return $rc + fi + + # Further verify the service availibility. + + ocf_log debug "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) monitor succeeded" + return $OCF_SUCCESS +} + +dcorch_identity_api_proxy_start() { + local rc + + dcorch_identity_api_proxy_status + rc=$? + if [ $rc -eq $OCF_SUCCESS ]; then + ocf_log info "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) already running" + return $OCF_SUCCESS + fi + + # Change the working dir to /, to be sure it's accesible + cd / + + # run the actual dcorch-identity-api-proxy daemon. Don't use ocf_run as we're sending the tool's output + # straight to /dev/null anyway and using ocf_run would break stdout-redirection here. + su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config --type identity \ + $OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid + + # Spin waiting for the server to come up. + # Let the CRM/LRM time us out if required + while true; do + dcorch_identity_api_proxy_monitor + rc=$? + [ $rc -eq $OCF_SUCCESS ] && break + if [ $rc -ne $OCF_NOT_RUNNING ]; then + ocf_log err "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) start failed" + exit $OCF_ERR_GENERIC + fi + sleep 1 + done + + ocf_log info "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) started" + return $OCF_SUCCESS +} + +dcorch_identity_api_proxy_confirm_stop() { + local my_bin + local my_processes + + my_binary=`which ${OCF_RESKEY_binary}` + my_type="identity" + my_processes=`pgrep -f "^(python|/usr/bin/python|/usr/bin/python2) ${my_binary} .*--type ${my_type}([^\w-]|$)"` + + if [ -n "${my_processes}" ] + then + ocf_log info "About to SIGKILL the following: ${my_processes}" + # replace the new line with with a space in the process list + kill -9 `echo "${my_processes}" | tr '\n' ' '` + fi +} + +dcorch_identity_api_proxy_stop() { + local rc + local pid + + dcorch_identity_api_proxy_status + rc=$? + if [ $rc -eq $OCF_NOT_RUNNING ]; then + ocf_log info "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) already stopped" + dcorch_identity_api_proxy_confirm_stop + return $OCF_SUCCESS + fi + + # Try SIGTERM + pid=`cat $OCF_RESKEY_pid` + ocf_run kill -s TERM $pid + rc=$? + if [ $rc -ne 0 ]; then + ocf_log err "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) couldn't be stopped" + dcorch_identity_api_proxy_confirm_stop + exit $OCF_ERR_GENERIC + fi + + # stop waiting + shutdown_timeout=15 + if [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then + shutdown_timeout=$((($OCF_RESKEY_CRM_meta_timeout/1000)-5)) + fi + count=0 + while [ $count -lt $shutdown_timeout ]; do + dcorch_identity_api_proxy_status + rc=$? + if [ $rc -eq $OCF_NOT_RUNNING ]; then + break + fi + count=`expr $count + 1` + sleep 1 + ocf_log debug "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) still hasn't stopped yet. Waiting ..." + done + + dcorch_identity_api_proxy_status + rc=$? + if [ $rc -ne $OCF_NOT_RUNNING ]; then + # SIGTERM didn't help either, try SIGKILL + ocf_log info "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) failed to stop after ${shutdown_timeout}s \ + using SIGTERM. Trying SIGKILL ..." + ocf_run kill -s KILL $pid + fi + dcorch_identity_api_proxy_confirm_stop + + ocf_log info "DC Orchestrator Identity Api proxy (dcorch-identity-api-proxy) stopped" + + rm -f $OCF_RESKEY_pid + + return $OCF_SUCCESS +} + +####################################################################### + +case "$1" in + meta-data) meta_data + exit $OCF_SUCCESS;; + usage|help) usage + exit $OCF_SUCCESS;; +esac + +# Anything except meta-data and help must pass validation +dcorch_identity_api_proxy_validate || exit $? + +# What kind of method was invoked? +case "$1" in + start) dcorch_identity_api_proxy_start;; + stop) dcorch_identity_api_proxy_stop;; + status) dcorch_identity_api_proxy_status;; + monitor) dcorch_identity_api_proxy_monitor;; + validate-all) ;; + *) usage + exit $OCF_ERR_UNIMPLEMENTED;; +esac + diff --git a/openstack/openstack-ras/centos/openstack-ras.spec b/openstack/openstack-ras/centos/openstack-ras.spec index 123cfb0f..52c41c72 100644 --- a/openstack/openstack-ras/centos/openstack-ras.spec +++ b/openstack/openstack-ras/centos/openstack-ras.spec @@ -14,7 +14,8 @@ URL: https://github.com/madkiss/openstack-resource-agents/tree/stable-grizzly Requires: /usr/bin/env Requires: /bin/sh -Source: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz +Source1: dcorch-identity-api-proxy %description OpenStack Resource Agents from Madkiss @@ -27,6 +28,7 @@ OpenStack Resource Agents from Madkiss rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-agent-central rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-evaluator rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-notifier +install -p -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/dcorch-identity-api-proxy %files %defattr(-,root,root,-) @@ -78,3 +80,4 @@ rm -rf ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack/ceilometer-alarm-notif "/usr/lib/ocf/resource.d/openstack/dcorch-neutron-api-proxy" "/usr/lib/ocf/resource.d/openstack/dcorch-cinder-api-proxy" "/usr/lib/ocf/resource.d/openstack/dcorch-patch-api-proxy" +"/usr/lib/ocf/resource.d/openstack/dcorch-identity-api-proxy"