openstack/puppet-murano
Code Issues Proposed changes

Fix murano base provider

Browse Source 
The previous keystone patches changed the location of the service
authentication credentials however the provider was not fixed.

This patch fixes that!

Change-Id: I1c3a3b78ec463f3fc48aca5363d466a021673594
This commit is contained in:
Mohammed Naser 2017-10-06 12:34:03 -04:00 committed by zhongshengping
parent 6dccd99b00
commit 9f05b278ae
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/puppet/provider/murano.rb
View File

@ -37,7 +37,7 @@ class Puppet::Provider::Murano < Puppet::Provider
def self.get_murano_credentials
#needed keys for authentication
auth_keys = ['auth_uri', 'admin_tenant_name', 'admin_user', 'admin_password']
auth_keys = ['auth_uri', 'project_name', 'username', 'password']
conf = murano_conf
if conf and conf['keystone_authtoken'] and
auth_keys.all?{|k| !conf['keystone_authtoken'][k].nil?}
@ -67,9 +67,9 @@ class Puppet::Provider::Murano < Puppet::Provider
m = murano_credentials
authenv = {
:OS_AUTH_URL => m['auth_uri'],
:OS_USERNAME => m['admin_user'],
:OS_TENANT_NAME => m['admin_tenant_name'],
:OS_PASSWORD => m['admin_password'],
:OS_USERNAME => m['username'],
:OS_TENANT_NAME => m['project_name'],
:OS_PASSWORD => m['password'],
:OS_ENDPOINT_TYPE => 'internalURL',
:OS_PROJECT_DOMAIN_NAME => m['project_domain_name'],
:OS_USER_DOMAIN_NAME => m['user_domain_name']

36
spec/unit/provider/murano_spec.rb
View File

@ -12,9 +12,9 @@ describe Puppet::Provider::Murano do
let :credential_hash do
{
'auth_uri' => 'https://192.168.56.210:35357',
'admin_tenant_name' => 'admin_tenant',
'admin_user' => 'admin',
'admin_password' => 'password',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
'project_domain_name' => 'Default',
'user_domain_name' => 'Default',
@ -62,9 +62,9 @@ describe Puppet::Provider::Murano do
it 'should set auth credentials in the environment' do
authenv = {
:OS_AUTH_URL => credential_hash['auth_uri'],
:OS_USERNAME => credential_hash['admin_user'],
:OS_TENANT_NAME => credential_hash['admin_tenant_name'],
:OS_PASSWORD => credential_hash['admin_password'],
:OS_USERNAME => credential_hash['username'],
:OS_TENANT_NAME => credential_hash['project_name'],
:OS_PASSWORD => credential_hash['password'],
:OS_ENDPOINT_TYPE => 'internalURL',
:OS_PROJECT_DOMAIN_NAME => credential_hash['project_domain_name'],
:OS_USER_DOMAIN_NAME => credential_hash['user_domain_name'],
@ -79,9 +79,9 @@ describe Puppet::Provider::Murano do
mock = {
'keystone_authtoken' => {
'auth_uri' => 'https://192.168.56.210:35357',
'admin_tenant_name' => 'admin_tenant',
'admin_user' => 'admin',
'admin_password' => 'password',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
},
'engine' => {
'packages_service' => 'glance',
@ -89,9 +89,9 @@ describe Puppet::Provider::Murano do
}
creds = {
'auth_uri' => 'https://192.168.56.210:35357',
'admin_tenant_name' => 'admin_tenant',
'admin_user' => 'admin',
'admin_password' => 'password',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
'packages_service' => 'glance',
'project_domain_name' => 'Default',
'user_domain_name' => 'Default',
@ -104,18 +104,18 @@ describe Puppet::Provider::Murano do
it 'should set auth env credentials with specified package service' do
creds = {
'auth_uri' => 'https://192.168.56.210:35357',
'admin_tenant_name' => 'admin_tenant',
'admin_user' => 'admin',
'admin_password' => 'password',
'project_name' => 'admin_tenant',
'username' => 'admin',
'password' => 'password',
'packages_service' => 'glance',
'project_domain_name' => 'Default',
'user_domain_name' => 'Default',
}
authenv = {
:OS_AUTH_URL => creds['auth_uri'],
:OS_USERNAME => creds['admin_user'],
:OS_TENANT_NAME => creds['admin_tenant_name'],
:OS_PASSWORD => creds['admin_password'],
:OS_USERNAME => creds['username'],
:OS_TENANT_NAME => creds['project_name'],
:OS_PASSWORD => creds['password'],
:OS_ENDPOINT_TYPE => 'internalURL',
:MURANO_PACKAGES_SERVICE => creds['packages_service'],
:OS_PROJECT_DOMAIN_NAME => creds['project_domain_name'],