Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Opentack agents updates #1198

Closed
wants to merge 4 commits into from
Closed

Opentack agents updates #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0ee0b7
Problem when re-attaching the volume
mgrzybek Jun 21, 2018
48174f7
v3 API support, better errors handling
mgrzybek Aug 27, 2018
faa2ed9
Uses 'crm_node -n' instead of HOSTNAME env variable, better layout
mgrzybek Aug 27, 2018
d9cd941
Uses 'crm_node -n' instead of HOSTNAME env variable, better layout, b…
mgrzybek Aug 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
56 changes: 48 additions & 8 deletions heartbeat/openstack-cinder-volume
View file
Open in desktop
Expand Up @@ -37,6 +37,8 @@
# Defaults
OCF_RESKEY_openstackcli_default="/usr/bin/openstack"

export attached_server_id=""

: ${OCF_RESKEY_openstackcli=${OCF_RESKEY_openstackcli_default}}

#######################################################################
Expand Down Expand Up @@ -104,7 +106,23 @@ END
}

osvol_validate() {
local node_id
local crm_node

check_binary "$OCF_RESKEY_openstackcli"
check_binary "awk"
check_binary "tr"

crm_node=$(crm_node -n)

node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $crm_node \
| tr ' ' '\n' \
| awk -F= '/value=/ {gsub("\"","");print $NF}')

if [ -z "$node_id" ] ; then
ocf_exit_reason "openstack_id attribute must be set for node $crm_node"
return $OCF_ERR_CONFIGURED
fi

if [ -z "$OCF_RESKEY_openrc" ]; then
ocf_exit_reason "openrc parameter not set"
Expand All @@ -128,8 +146,8 @@ osvol_validate() {

osvol_monitor() {
local result
local attached_server_id
local node_id
local crm_node

# Is the volue attached?
result=$($OCF_RESKEY_openstackcli volume show \
Expand All @@ -138,14 +156,18 @@ osvol_monitor() {
--format value \
$OCF_RESKEY_volume_id)

crm_node=$(crm_node -n)

if [[ "$result" =~ "available" ]] ; then
ocf_log warn "$OCF_RESKEY_volume_id is not attached to any instance"
return $OCF_NOT_RUNNING
else
attached_server_id=$(echo $result|head -n1|awk -F "'" '{print $4}')
export attached_server_id=$(echo $result|head -n1|awk -F "'" '{print $4}')
ocf_log info "$OCF_RESKEY_volume_id is attached to instance $attached_server_id"
node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME \
| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')

node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $crm_node \
| tr ' ' '\n' \
| awk -F= '/value=/ {gsub("\"","");print $NF}')

if [ "$node_id" != "$attached_server_id" ] ; then
return $OCF_NOT_RUNNING
Expand All @@ -157,15 +179,20 @@ osvol_monitor() {

osvol_stop() {
local node_id
local crm_node

osvol_monitor
if [ $? = $OCF_NOT_RUNNING ]; then
ocf_log info "Volume $OCF_RESKEY_volume_id already available"
return $OCF_SUCCESS
fi

node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME \
| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
crm_node=$(crm_node -n)

node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $crm_node \
| tr ' ' '\n' \
| awk -F= '/value=/ {gsub("\"","");print $NF}')

if ! $OCF_RESKEY_openstackcli server remove volume $node_id $OCF_RESKEY_volume_id ; then
ocf_log error "Couldn't remove volume $OCF_RESKEY_volume_id from instance $node_id"
return $OCF_ERR_GENERIC
Expand All @@ -177,15 +204,28 @@ osvol_stop() {

osvol_start() {
local node_id
local crm_node

osvol_monitor
if [ $? = $OCF_SUCCESS ]; then
ocf_log info "$OCF_RESKEY_volume_id already attached"
return $OCF_SUCCESS
fi

node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME \
| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
if [ ! -z $attached_server_id ] ; then
if ! $OCF_RESKEY_openstackcli server remove volume $attached_server_id $OCF_RESKEY_volume_id ; then
ocf_log error "Couldn't remove volume $OCF_RESKEY_volume_id from instance $attached_server_id"
return $OCF_ERR_GENERIC
fi
fi

export $attached_server_id=""
crm_node=$(crm_node -n)

node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $crm_node \
| tr ' ' '\n' \
| awk -F= '/value=/ {gsub("\"","");print $NF}')

$OCF_RESKEY_openstackcli server add volume $node_id $OCF_RESKEY_volume_id
if [ $? != $OCF_SUCCESS ]; then
ocf_log error "Couldn't add volume $OCF_RESKEY_volume_id to instance $node_id"
Expand Down
18 changes: 12 additions & 6 deletions heartbeat/openstack-floating-ip
View file
Open in desktop
Expand Up @@ -132,7 +132,7 @@ osflip_validate() {
return $OCF_ERR_CONFIGURED
fi

${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $HOSTNAME > /dev/null 2>&1
${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) > /dev/null 2>&1
if [ $? -ne 0 ] ; then
ocf_log warn "attr_updater failed to get openstack_ports attribute of node $OCF_RESOURCE_INSTANCE"
return $OCF_ERR_GENERIC
Expand All @@ -147,8 +147,10 @@ osflip_monitor() {
local node_port_ids
local port
local buffer
local crm_node

node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $HOSTNAME \
crm_node=$(crm_node -n)
node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $crm_node \
| awk -F= '{gsub("\"","");print $NF}' \
| tr ',' ' ' \
| awk -F: '{print $NF}')
Expand All @@ -162,13 +164,13 @@ osflip_monitor() {
for port in $node_port_ids ; do
if echo $result | grep -q $port ; then
floating_ip=$(echo $result | awk '/floating_ip_address/ {print $2}')
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_floating_ip -v $floating_ip
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -S status -n openstack_floating_ip -v $floating_ip

return $OCF_SUCCESS
fi
done

${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_floating_ip
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -S state -n openstack_floating_ip
ocf_log warn "$OCF_RESKEY_ip_id is not attached to any fixed address"
return $OCF_NOT_RUNNING
}
Expand Down Expand Up @@ -207,9 +209,13 @@ osflip_start() {
fi

# Get port_id from subnet_id
node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $HOSTNAME \
node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) \
| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
node_port_id=$(echo $node_port_ids|tr ',' '\n'|awk -F: "/$OCF_RESKEY_subnet_id/ {print \$2}")

node_port_id=$(echo $node_port_ids \
| tr ',' '\n' \
| awk -F: "/$OCF_RESKEY_subnet_id/ {print \$2}")

ocf_log info "Moving IP address $OCF_RESKEY_ip_id to port ID $node_port_id"

$OCF_RESKEY_openstackcli floating ip set --port $node_port_id $OCF_RESKEY_ip_id
Expand Down
26 changes: 22 additions & 4 deletions heartbeat/openstack-info
View file
Open in desktop
Expand Up @@ -115,6 +115,10 @@ OSInfoStats() {
--format value --column ID --column Name \
| grep $node)

if [ $? -ne 0 ] ; then
ocf_exit_reason "cannot find $node in instances list"
exit $OCF_ERR_GENERIC
fi
node_id=$(echo $result|awk '{print $1}')

# Nova data: flavor, AZ…
Expand Down Expand Up @@ -148,14 +152,26 @@ OSInfoStats() {
value="$value,$p"
fi
done
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_ports -v $value
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_ports -v "$value"

if [ ! -z "$OS_REGION_NAME" ] ; then
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_region -v $OS_REGION_NAME
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_region -v "$OS_REGION_NAME"
fi

if [ ! -z "$OS_TENANT_ID" ] ; then
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_tenant_id -v "$OS_TENANT_ID"

if [ ! -z "$OS_TENANT_NAME" ] ; then
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_tenant_name -v "$OS_TENANT_NAME"
fi
else
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_project_id -v "$OS_PROJECT_ID"

if [ ! -z "$OS_PROJECT_NAME" ] ; then
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_project_name -v "$OS_PROJECT_NAME"
fi
fi

${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_tenant_name -v $OS_TENANT_NAME
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_tenant_id -v $OS_TENANT_ID
}

OSInfo_usage() {
Expand All @@ -181,6 +197,8 @@ OSInfo_stop() {
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_region
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_tenant_id
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_tenant_name
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_project_id
${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_project_name
exit $OCF_SUCCESS
}

Expand Down