x
/
openstack-resource-agents
Code Issues Proposed changes

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>
This commit is contained in:
Vincent Untz 2016-01-07 22:29:21 +01:00
parent f178723d40
commit 9df293dcb1
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ocf/NovaCompute
View File

@ -100,6 +100,24 @@ Nova API location (internal, public or admin URL)
<content type="string" default="" /> <content type="string" default="" />
</parameter> </parameter>
<parameter name="region_name" unique="0" required="0">
<longdesc lang="en">
Region name for connecting to nova.
</longdesc>
<shortdesc lang="en">Region name</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="insecure" unique="0" required="0">
<longdesc lang="en">
Explicitly allow client to perform "insecure" TLS (https) requests.
The server's certificate will not be verified against any certificate authorities.
This option should be used with caution.
</longdesc>
<shortdesc lang="en">Allow insecure TLS requests</shortdesc>
<content type="boolean" default="0" />
</parameter>
<parameter name="no_shared_storage" unique="0" required="0"> <parameter name="no_shared_storage" unique="0" required="0">
<longdesc lang="en"> <longdesc lang="en">
Disable shared storage recovery for instances. Use at your own risk! Disable shared storage recovery for instances. Use at your own risk!
@ -278,6 +296,16 @@ nova_validate() {
fence_options="${fence_options} -d ${OCF_RESKEY_domain}" fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
fi fi
if [ -n "${OCF_RESKEY_region_name}" ]; then
fence_options="${fence_options} --region-name ${OCF_RESKEY_region_name}"
fi
if [ -n "${OCF_RESKEY_insecure}" ]; then
if ocf_is_true "${OCF_RESKEY_insecure}"; then
fence_options="${fence_options} --insecure"
fi
fi
if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then
if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then
fence_options="${fence_options} --no-shared-storage" fence_options="${fence_options} --no-shared-storage"

28
ocf/NovaEvacuate
View File

@ -100,6 +100,24 @@ Nova API location (internal, public or admin URL)
<content type="string" default="" /> <content type="string" default="" />
</parameter> </parameter>
<parameter name="region_name" unique="0" required="0">
<longdesc lang="en">
Region name for connecting to nova.
</longdesc>
<shortdesc lang="en">Region name</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="insecure" unique="0" required="0">
<longdesc lang="en">
Explicitly allow client to perform "insecure" TLS (https) requests.
The server's certificate will not be verified against any certificate authorities.
This option should be used with caution.
</longdesc>
<shortdesc lang="en">Allow insecure TLS requests</shortdesc>
<content type="boolean" default="0" />
</parameter>
<parameter name="no_shared_storage" unique="0" required="0"> <parameter name="no_shared_storage" unique="0" required="0">
<longdesc lang="en"> <longdesc lang="en">
Disable shared storage recovery for instances. Use at your own risk! Disable shared storage recovery for instances. Use at your own risk!
@ -285,6 +303,16 @@ evacuate_validate() {
fence_options="${fence_options} -d ${OCF_RESKEY_domain}" fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
fi fi
if [ -n "${OCF_RESKEY_region_name}" ]; then
fence_options="${fence_options} --region-name ${OCF_RESKEY_region_name}"
fi
if [ -n "${OCF_RESKEY_insecure}" ]; then
if ocf_is_true "${OCF_RESKEY_insecure}"; then
fence_options="${fence_options} --insecure"
fi
fi
if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then
if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then
fence_options="${fence_options} --no-shared-storage" fence_options="${fence_options} --no-shared-storage"