rename keystone_v2_authenticate method

In puppet-neutron, keystone_v2_authenticate already exists and is in
colision with the keystone_v2_authenticate in puppet-heat.

While we move the whole method in puppet-openstacklib, let's just rename
the method from keystone_v2_authenticate to keystone_v2_auth.

Closes-bug #1429096

Change-Id: I15b6d0550bb3baef37d7536d264b822768802ad0
This commit is contained in:
Emilien Macchi 2015-03-06 15:31:09 -05:00
parent a8b8664108
commit d73a719477
1 changed files with 3 additions and 3 deletions

View File

@ -69,7 +69,7 @@ end
# +tenantName+::
# Tenant name
#
def keystone_v2_authenticate(auth_url,
def heat_handle_requests(auth_url,
username,
password,
tenantId=nil,
@ -105,7 +105,7 @@ end
#
# +auth_url+::
# Keystone endpoint. See the notes for +auth_url+ in
# +keystone_v2_authenticate+.
# +heat_handle_requests+.
#
# +token+::
# A Keystone token that will be passed in requests as the value of the
@ -127,7 +127,7 @@ end
Puppet::Type.type(:heat_domain_id_setter).provide(:ruby) do
def authenticate
token, authinfo = keystone_v2_authenticate(
token, authinfo = heat_handle_requests(
@resource[:auth_url],
@resource[:auth_username],
@resource[:auth_password],