x/openstack-resource-agents
Code Issues Proposed changes

Change variable name

Browse Source 
Use a more accurate name
This commit is contained in:
Sébastien Han 2012-09-07 00:38:33 +02:00
parent dcb2d26bd7
commit 4e7c352782
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ocf/quantum-server
View File

@ -40,14 +40,14 @@ OCF_RESKEY_config_default="/etc/quantum/quantum.conf"
OCF_RESKEY_user_default="quantum" OCF_RESKEY_user_default="quantum"
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid" OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
OCF_RESKEY_url_default="http://127.0.0.1:9696" OCF_RESKEY_url_default="http://127.0.0.1:9696"
OCF_RESKEY_keystone_url_default="http://127.0.0.1:5000/v2.0/tokens" OCF_RESKEY_keystone_get_token_url_default="http://127.0.0.1:5000/v2.0/tokens"
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}} : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
: ${OCF_RESKEY_url=${OCF_RESKEY_url_default}} : ${OCF_RESKEY_url=${OCF_RESKEY_url_default}}
: ${OCF_RESKEY_keystone_url=${OCF_RESKEY_keystone_url_default}} : ${OCF_RESKEY_keystone_get_token_url=${OCF_RESKEY_keystone_get_token_url_default}}
####################################################################### #######################################################################
@ -122,13 +122,13 @@ The default URL to use for monitoring this instance (quantum-server) via curl. I
<content type="string" default="${OCF_RESKEY_url_default}" /> <content type="string" default="${OCF_RESKEY_url_default}" />
</parameter> </parameter>
<parameter name="keystone_url" unique="0" required="0"> <parameter name="keystone_get_token_url" unique="0" required="0">
<longdesc lang="en"> <longdesc lang="en">
The default URL to use to acquire a Quantum API (quantum-server) token for monitoring this instance The default URL to use to acquire a Quantum API (quantum-server) token for monitoring this instance
of OpenStack Quantum API (quantum-server) of OpenStack Quantum API (quantum-server)
</longdesc> </longdesc>
<shortdesc lang="en">OpenStack Quantum API (quantum-server) url</shortdesc> <shortdesc lang="en">OpenStack Quantum API (quantum-server) url</shortdesc>
<content type="string" default="${OCF_RESKEY_keystone_url_default}" /> <content type="string" default="${OCF_RESKEY_keystone_get_token_url_default}" />
</parameter> </parameter>
<parameter name="os_username" unique="0" required="0"> <parameter name="os_username" unique="0" required="0">
@ -246,10 +246,10 @@ quantum_server_monitor() {
# Check detailed information about this specific version of the API. # Check detailed information about this specific version of the API.
if [ -n "$OCF_RESKEY_os_username" ] && [ -n "$OCF_RESKEY_os_password" ] \ if [ -n "$OCF_RESKEY_os_username" ] && [ -n "$OCF_RESKEY_os_password" ] \
&& [ -n "$OCF_RESKEY_os_tenant_name" ] && [ -n "$OCF_RESKEY_keystone_url" ]; then && [ -n "$OCF_RESKEY_os_tenant_name" ] && [ -n "$OCF_RESKEY_keystone_get_token_url" ]; then
token=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OCF_RESKEY_os_username\", \ token=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OCF_RESKEY_os_username\", \
\"password\": \"$OCF_RESKEY_os_password\"}, \"tenantName\": \"$OCF_RESKEY_os_tenant_name\"}}" \ \"password\": \"$OCF_RESKEY_os_password\"}, \"tenantName\": \"$OCF_RESKEY_os_tenant_name\"}}" \
-H "Content-type: application/json" $OCF_RESKEY_keystone_url | tr ',' '\n' | grep '"id":' \ -H "Content-type: application/json" $OCF_RESKEY_keystone_get_token_url | tr ',' '\n' | grep '"id":' \
| cut -d'"' -f4 | head --lines 1` | cut -d'"' -f4 | head --lines 1`
http_code=`curl --write-out %{http_code} --output /dev/null -sH "X-Auth-Token: $token" $OCF_RESKEY_url` http_code=`curl --write-out %{http_code} --output /dev/null -sH "X-Auth-Token: $token" $OCF_RESKEY_url`
rc=$? rc=$?