openstack
/
fuel-library
Code Issues Proposed changes

Use keystone::authtoken for aodh 

Upstream patch https://review.openstack.org/#/c/378154 removes
deprecated parameters from aodh::api, so we need adapt
fuel-library and use aodh::keystone::authtoken instead

Closes-Bug: #1628488
Partial-Bug: #1477967

Change-Id: Ie391fc161cddf905d5675220e3e9cee85d6c5cd4
This commit is contained in:
Mykyta Karpin 2016-09-28 16:05:44 +03:00
parent 6bd961cc07
commit bb827af9fe
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deployment/puppet/openstack_tasks/manifests/aodh/aodh.pp
View File

@ -141,15 +141,18 @@ class openstack_tasks::aodh::aodh {
user => $db_user,
}
class { '::aodh::keystone::authtoken':
username => $aodh_user_name,
password => $aodh_user_password,
project_name => $tenant,
auth_uri => $keystone_auth_uri,
auth_url => $keystone_auth_url,
memcached_servers => $memcached_servers,
}
class { '::aodh::api':
enabled => true,
package_ensure => 'present',
keystone_user => $aodh_user_name,
keystone_password => $aodh_user_password,
keystone_tenant => $tenant,
keystone_auth_uri => $keystone_auth_uri,
keystone_auth_url => $keystone_auth_url,
memcached_servers => $memcached_servers,
service_name => 'httpd',
}

11
tests/noop/spec/hosts/aodh/aodh_spec.rb
View File

@ -64,6 +64,17 @@ describe manifest do
ssl = 'false'
it 'should declare aodh::keystone::authtoken class with correct parameters' do
should contain_class('aodh::keystone::authtoken').with(
'username' => user,
'password' => password,
'project_name' => tenant,
'auth_uri' => keystone_auth_uri,
'auth_url' => keystone_auth_url,
'memcached_servers' => memcached_servers,
)
end
it 'should declare aodh::wsgi::apache class with correct parameters' do
should contain_class('aodh::wsgi::apache').with(
'ssl' => ssl,