Browse Source

Add insecure and region_name parameters to NovaCompute and NovaEvacuate

These can be quite useful in some setups.

This depends on https://github.com/ClusterLabs/fence-agents/pull/37

Change-Id: I2cfef0a4bf7f94f74041c8fee236788c7a110cc5
Signed-off-by: Vincent Untz <vuntz@suse.com>
Vincent Untz 3 years ago
parent
commit
9df293dcb1
2 changed files with 56 additions and 0 deletions
  1. 28
    0
      ocf/NovaCompute
  2. 28
    0
      ocf/NovaEvacuate

+ 28
- 0
ocf/NovaCompute View File

@@ -100,6 +100,24 @@ Nova API location (internal, public or admin URL)
100 100
 <content type="string" default="" />
101 101
 </parameter>
102 102
 
103
+<parameter name="region_name" unique="0" required="0">
104
+<longdesc lang="en">
105
+Region name for connecting to nova.
106
+</longdesc>
107
+<shortdesc lang="en">Region name</shortdesc>
108
+<content type="string" default="" />
109
+</parameter>
110
+
111
+<parameter name="insecure" unique="0" required="0">
112
+<longdesc lang="en">
113
+Explicitly allow client to perform "insecure" TLS (https) requests.
114
+The server's certificate will not be verified against any certificate authorities.
115
+This option should be used with caution.
116
+</longdesc>
117
+<shortdesc lang="en">Allow insecure TLS requests</shortdesc>
118
+<content type="boolean" default="0" />
119
+</parameter>
120
+
103 121
 <parameter name="no_shared_storage" unique="0" required="0">
104 122
 <longdesc lang="en">
105 123
 Disable shared storage recovery for instances. Use at your own risk!
@@ -278,6 +296,16 @@ nova_validate() {
278 296
 	fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
279 297
     fi
280 298
 
299
+    if [ -n "${OCF_RESKEY_region_name}" ]; then
300
+	fence_options="${fence_options} --region-name ${OCF_RESKEY_region_name}"
301
+    fi
302
+
303
+    if [ -n "${OCF_RESKEY_insecure}" ]; then
304
+	if ocf_is_true "${OCF_RESKEY_insecure}"; then
305
+	    fence_options="${fence_options} --insecure"
306
+	fi
307
+    fi
308
+
281 309
     if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then
282 310
 	if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then
283 311
 	    fence_options="${fence_options} --no-shared-storage"

+ 28
- 0
ocf/NovaEvacuate View File

@@ -100,6 +100,24 @@ Nova API location (internal, public or admin URL)
100 100
 <content type="string" default="" />
101 101
 </parameter>
102 102
 
103
+<parameter name="region_name" unique="0" required="0">
104
+<longdesc lang="en">
105
+Region name for connecting to nova.
106
+</longdesc>
107
+<shortdesc lang="en">Region name</shortdesc>
108
+<content type="string" default="" />
109
+</parameter>
110
+
111
+<parameter name="insecure" unique="0" required="0">
112
+<longdesc lang="en">
113
+Explicitly allow client to perform "insecure" TLS (https) requests.
114
+The server's certificate will not be verified against any certificate authorities.
115
+This option should be used with caution.
116
+</longdesc>
117
+<shortdesc lang="en">Allow insecure TLS requests</shortdesc>
118
+<content type="boolean" default="0" />
119
+</parameter>
120
+
103 121
 <parameter name="no_shared_storage" unique="0" required="0">
104 122
 <longdesc lang="en">
105 123
 Disable shared storage recovery for instances. Use at your own risk!
@@ -285,6 +303,16 @@ evacuate_validate() {
285 303
 	fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
286 304
     fi
287 305
 
306
+    if [ -n "${OCF_RESKEY_region_name}" ]; then
307
+	fence_options="${fence_options} --region-name ${OCF_RESKEY_region_name}"
308
+    fi
309
+
310
+    if [ -n "${OCF_RESKEY_insecure}" ]; then
311
+	if ocf_is_true "${OCF_RESKEY_insecure}"; then
312
+	    fence_options="${fence_options} --insecure"
313
+	fi
314
+    fi
315
+
288 316
     if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then
289 317
 	if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then
290 318
 	    fence_options="${fence_options} --no-shared-storage"

Loading…
Cancel
Save