|
 |
df1f87 |
From b8793b7cdacf0eb13e86581fcba1f78bb7a4bc13 Mon Sep 17 00:00:00 2001
|
|
|
df1f87 |
From: Tim Megela <megela@google.com>
|
|
|
df1f87 |
Date: Thu, 11 Mar 2021 06:41:59 -0500
|
|
|
df1f87 |
Subject: [PATCH] Default method moved back to powercycle
|
|
|
df1f87 |
|
|
|
df1f87 |
Moving back to powercycle as the default method for GCE. This is the recommended approach from Google. Using on/off as the default will have unintended consequences on google cloud platforms.
|
|
|
df1f87 |
---
|
|
|
df1f87 |
agents/gce/fence_gce.py | 2 ++
|
|
|
df1f87 |
tests/data/metadata/fence_gce.xml | 2 +-
|
|
|
df1f87 |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
df1f87 |
|
|
|
df1f87 |
diff --git a/agents/gce/fence_gce.py b/agents/gce/fence_gce.py
|
|
|
df1f87 |
index 1784e1b70..d59ce2bad 100644
|
|
|
df1f87 |
--- a/agents/gce/fence_gce.py
|
|
|
df1f87 |
+++ b/agents/gce/fence_gce.py
|
|
|
df1f87 |
@@ -358,6 +358,8 @@ def main():
|
|
|
df1f87 |
define_new_opts()
|
|
|
df1f87 |
|
|
|
df1f87 |
all_opt["power_timeout"]["default"] = "60"
|
|
|
df1f87 |
+ all_opt["method"]["default"] = "cycle"
|
|
|
df1f87 |
+ all_opt["method"]["help"] = "-m, --method=[method] Method to fence (onoff|cycle) (Default: cycle)"
|
|
|
df1f87 |
|
|
|
df1f87 |
options = check_input(device_opt, process_input(device_opt))
|
|
|
df1f87 |
|
|
|
df1f87 |
diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml
|
|
|
df1f87 |
index f09c771f3..bb5137878 100644
|
|
|
df1f87 |
--- a/tests/data/metadata/fence_gce.xml
|
|
|
df1f87 |
+++ b/tests/data/metadata/fence_gce.xml
|
|
|
df1f87 |
@@ -12,7 +12,7 @@ For instructions see: https://cloud.google.com/compute/docs/tutorials/python-gui
|
|
|
df1f87 |
</parameter>
|
|
|
df1f87 |
<parameter name="method" unique="0" required="0">
|
|
|
df1f87 |
<getopt mixed="-m, --method=[method]" />
|
|
|
df1f87 |
- <content type="select" default="onoff" >
|
|
|
df1f87 |
+ <content type="select" default="cycle" >
|
|
|
df1f87 |
<option value="onoff" />
|
|
|
df1f87 |
<option value="cycle" />
|
|
|
df1f87 |
</content>
|