x/openstack-resource-agents
Code Issues Proposed changes

Folsom update

Browse Source
This commit is contained in:
EmilienM 2012-09-13 07:28:13 +00:00
parent 008983ff2d
commit ec15071aad
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ocf/glance-api
View File

@ -239,10 +239,10 @@ glance_api_monitor() {
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_os_auth_url" ]; then && [ -n "$OCF_RESKEY_os_tenant_name" ] && [ -n "$OCF_RESKEY_os_auth_url" ]; then
ocf_run -q $OCF_RESKEY_client_binary \ ocf_run -q $OCF_RESKEY_client_binary \
--os_username "$OCF_RESKEY_os_username" \ --os-username "$OCF_RESKEY_os_username" \
--os_password "$OCF_RESKEY_os_password" \ --os-password "$OCF_RESKEY_os_password" \
--os_tenant_name "$OCF_RESKEY_os_tenant_name" \ --os-tenant-name "$OCF_RESKEY_os_tenant_name" \
--os_auth_url "$OCF_RESKEY_os_auth_url" \ --os-auth-url "$OCF_RESKEY_os_auth_url" \
index > /dev/null 2>&1 index > /dev/null 2>&1
rc=$? rc=$?
if [ $rc -ne 0 ]; then if [ $rc -ne 0 ]; then

4
ocf/nova-network
View File

@ -1,11 +1,11 @@
#!/bin/sh #!/bin/sh
# #
# #
# OpenStack Network Service (nova-network) # OpenStack Network Service (nova-network) (replaced by Quantum in Folsom)
# #
# Description: Manages an OpenStack Network Service (nova-network) process as an HA resource # Description: Manages an OpenStack Network Service (nova-network) process as an HA resource
# #
# Authors: Emilien Macchi # Authors: Sebastien Han & Emilien Macchi
# Mainly inspired by the Nova Scheduler resource agent written by Sebastien Han : http://goo.gl/s8hOU # Mainly inspired by the Nova Scheduler resource agent written by Sebastien Han : http://goo.gl/s8hOU
# Which are also inspired by the resource agents written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr # Which are also inspired by the resource agents written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
# #