resource-agents/SOURCES/bz1890068-gcp-pd-move-fix-partially-matched-disk_name.patch

59 lines
1.8 KiB
Diff
Raw Normal View History

2021-03-30 14:43:28 +00:00
From 2927279ba1677e9dda202121176a8245a7ef76ca Mon Sep 17 00:00:00 2001
From: tositaka77 <45960626+tositaka77@users.noreply.github.com>
Date: Wed, 14 Oct 2020 22:22:56 +0900
Subject: [PATCH] fixes and improvements
- Fixed "regional" PD functionality in attach_disk()
- Improve to exact match disk_name with disks.source in detach_disk()
---
heartbeat/gcp-pd-move.in | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/heartbeat/gcp-pd-move.in b/heartbeat/gcp-pd-move.in
index f82bd25e5..e99cc71f8 100644
--- a/heartbeat/gcp-pd-move.in
+++ b/heartbeat/gcp-pd-move.in
@@ -49,6 +49,7 @@ else:
CONN = None
PROJECT = None
ZONE = None
+REGION = None
LIST_DISK_ATTACHED_INSTANCES = None
INSTANCE_NAME = None
@@ -148,6 +149,7 @@ def populate_vars():
global INSTANCE_NAME
global PROJECT
global ZONE
+ global REGION
global LIST_DISK_ATTACHED_INSTANCES
# Populate global vars
@@ -175,6 +177,7 @@ def populate_vars():
PROJECT = get_metadata('project/project-id')
if PARAMETERS['disk_scope'] in ['detect', 'regional']:
ZONE = get_metadata('instance/zone').split('/')[-1]
+ REGION = ZONE[:-2]
else:
ZONE = PARAMETERS['disk_scope']
LIST_DISK_ATTACHED_INSTANCES = get_disk_attached_instances(
@@ -255,7 +258,7 @@ def detach_disk(instance, disk_name):
device_name = None
for disk in response['disks']:
- if disk_name in disk['source']:
+ if disk_name == re.sub('.*disks/',"",disk['source']):
device_name = disk['deviceName']
break
@@ -273,6 +276,9 @@ def detach_disk(instance, disk_name):
def attach_disk(instance, disk_name):
location = 'zones/%s' % ZONE
+ if PARAMETERS['disk_scope'] == 'regional':
+ location = 'regions/%s' % REGION
+
prefix = 'https://www.googleapis.com/compute/v1'
body = {
'source': '%(prefix)s/projects/%(project)s/%(location)s/disks/%(disk)s' % {