37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
From 6f1743a7c34b00b0d1602675598ae22a2a3de6b4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||
|
|
Date: Thu, 14 Jan 2021 15:11:14 +0100
|
||
|
|
Subject: [PATCH] fence_gce: default to onoff
|
||
|
|
|
||
|
|
---
|
||
|
|
agents/gce/fence_gce.py | 2 --
|
||
|
|
tests/data/metadata/fence_gce.xml | 2 +-
|
||
|
|
2 files changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/agents/gce/fence_gce.py b/agents/gce/fence_gce.py
|
||
|
|
index bf5f5693..84cf3634 100644
|
||
|
|
--- a/agents/gce/fence_gce.py
|
||
|
|
+++ b/agents/gce/fence_gce.py
|
||
|
|
@@ -334,8 +334,6 @@ def main():
|
||
|
|
define_new_opts()
|
||
|
|
|
||
|
|
all_opt["power_timeout"]["default"] = "60"
|
||
|
|
- all_opt["method"]["default"] = "cycle"
|
||
|
|
- all_opt["method"]["help"] = "-m, --method=[method] Method to fence (onoff|cycle) (Default: cycle)"
|
||
|
|
|
||
|
|
options = check_input(device_opt, process_input(device_opt))
|
||
|
|
|
||
|
|
diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml
|
||
|
|
index 33478721..77812ffb 100644
|
||
|
|
--- a/tests/data/metadata/fence_gce.xml
|
||
|
|
+++ b/tests/data/metadata/fence_gce.xml
|
||
|
|
@@ -12,7 +12,7 @@ For instructions see: https://cloud.google.com/compute/docs/tutorials/python-gui
|
||
|
|
</parameter>
|
||
|
|
<parameter name="method" unique="0" required="0">
|
||
|
|
<getopt mixed="-m, --method=[method]" />
|
||
|
|
- <content type="select" default="cycle" >
|
||
|
|
+ <content type="select" default="onoff" >
|
||
|
|
<option value="onoff" />
|
||
|
|
<option value="cycle" />
|
||
|
|
</content>
|