diff --git a/lib/puppet/provider/sahara.rb b/lib/puppet/provider/sahara.rb index e4a533c9..baeac6af 100644 --- a/lib/puppet/provider/sahara.rb +++ b/lib/puppet/provider/sahara.rb @@ -45,7 +45,7 @@ class Puppet::Provider::Sahara < Puppet::Provider::Openstack end def self.get_sahara_credentials - auth_keys = ['auth_uri', 'admin_tenant_name', 'admin_user', + auth_keys = ['auth_url', 'admin_tenant_name', 'admin_user', 'admin_password'] conf = sahara_conf if conf and conf['keystone_authtoken'] and @@ -61,7 +61,7 @@ class Puppet::Provider::Sahara < Puppet::Provider::Openstack def self.get_auth_endpoint q = sahara_credentials - "#{q['auth_uri']}" + "#{q['auth_url']}" end def self.auth_endpoint diff --git a/spec/unit/provider/sahara_spec.rb b/spec/unit/provider/sahara_spec.rb index ba241105..7ce2edfd 100644 --- a/spec/unit/provider/sahara_spec.rb +++ b/spec/unit/provider/sahara_spec.rb @@ -24,14 +24,14 @@ describe Puppet::Provider::Sahara do it 'should read conf file with all sections' do creds_hash = { - 'auth_uri' => 'https://192.168.56.210:35357/v2.0/', + 'auth_url' => 'https://192.168.56.210:35357/v2.0/', 'admin_tenant_name' => 'admin_tenant', 'admin_user' => 'admin', 'admin_password' => 'password', } mock = { 'keystone_authtoken' => { - 'auth_uri' => 'https://192.168.56.210:35357/v2.0/', + 'auth_url' => 'https://192.168.56.210:35357/v2.0/', 'admin_tenant_name' => 'admin_tenant', 'admin_user' => 'admin', 'admin_password' => 'password',