neutron-ha-tool: add os_region_name parameter

This adds an os_region_name parameter which gets passed to
the neutron-ha-tool Python script, in order to support this
upstream change to the latter:

  58f12c5060

This was rescued from the unmerged pull request on the old repository:

  https://github.com/madkiss/openstack-resource-agents/pull/21

See also https://github.com/crowbar/barclamp-neutron/pull/217

(cherry picked from commit 7fa9b868e30143bc26e09b9db8ace41c5efeb49b)
Closes-Bug: #1508416
Change-Id: Iaee553c71ecce063e9272024e42590fc2e8aa515
This commit is contained in:
Adam Spiers 2015-05-11 16:06:28 +01:00
parent a0b55d3329
commit a78003ee1c
1 changed files with 12 additions and 0 deletions

View File

@ -24,6 +24,7 @@
# OCF instance parameters:
# OCF_RESKEY_binary
# OCF_RESKEY_os_auth_url
# OCF_RESKEY_os_region_name
# OCF_RESKEY_os_username
# OCF_RESKEY_os_password
# OCF_RESKEY_os_tenant_name
@ -39,6 +40,7 @@
OCF_RESKEY_binary_default="neutron-ha-tool"
OCF_RESKEY_os_auth_url_default="http://localhost:5000/v2"
OCF_RESKEY_os_region_name_default=""
OCF_RESKEY_os_username_default="admin"
OCF_RESKEY_os_password_defaut=""
OCF_RESKEY_os_tenant_name_default="admin"
@ -47,6 +49,7 @@ OCF_RESKEY_os_cacert_default=""
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
: ${OCF_RESKEY_os_auth_url=${OCF_RESKEY_os_auth_url_default}}
: ${OCF_RESKEY_os_region_name=${OCF_RESKEY_os_region_name_default}}
: ${OCF_RESKEY_os_tenant_name=${OCF_RESKEY_os_tenant_name_default}}
: ${OCF_RESKEY_os_username=${OCF_RESKEY_os_username_default}}
: ${OCF_RESKEY_os_password=${OCF_RESKEY_os_password_default}}
@ -105,6 +108,14 @@ The URL pointing to the Keystone instance to use for authentication.
<content type="string" default="${OCF_RESKEY_os_auth_url_default}" />
</parameter>
<parameter name="os_region_name" unique="0" required="0">
<longdesc lang="en">
The region name to use for authentication against keystone.
</longdesc>
<shortdesc lang="en">Keystone region name</shortdesc>
<content type="string" default="${OCF_RESKEY_os_region_name_default}" />
</parameter>
<parameter name="os_password" unique="0" required="1">
<longdesc lang="en">
The password to use for authentication against keystone.
@ -249,6 +260,7 @@ neutron_ha_tool_validate || exit $?
# OPENSTACK env variables
export OS_AUTH_URL=$OCF_RESKEY_os_auth_url
export OS_REGION_NAME=$OCF_RESKEY_os_region_name
export OS_TENANT_NAME=$OCF_RESKEY_os_tenant_name
export OS_USERNAME=$OCF_RESKEY_os_username
export OS_PASSWORD=$OCF_RESKEY_os_password