Revert "Add missing release note for switching to puppet-oslo"
This reverts commit 0909cc7a58
.
It broke Fuel noop CI due to policy being duplicated.
Change-Id: Iecae8324f0998e6de456515c28b02669bfb06fdf
This commit is contained in:
parent
0909cc7a58
commit
4b6aaab2ed
|
@ -7,6 +7,8 @@ class aodh::params {
|
|||
case $::osfamily {
|
||||
'RedHat': {
|
||||
$common_package_name = 'openstack-aodh-common'
|
||||
$psycopg_package_name = 'python-psycopg2'
|
||||
$sqlite_package_name = undef
|
||||
$api_package_name = 'openstack-aodh-api'
|
||||
$api_service_name = 'openstack-aodh-api'
|
||||
$notifier_package_name = 'openstack-aodh-notifier'
|
||||
|
@ -21,11 +23,15 @@ class aodh::params {
|
|||
$expirer_service_name = 'openstack-aodh-expirer'
|
||||
$listener_package_name = 'openstack-aodh-listener'
|
||||
$listener_service_name = 'openstack-aodh-listener'
|
||||
$pymongo_package_name = 'python-pymongo'
|
||||
$pymysql_package_name = undef
|
||||
$aodh_wsgi_script_path = '/var/www/cgi-bin/aodh'
|
||||
$aodh_wsgi_script_source = '/usr/lib/python2.7/site-packages/aodh/api/app.wsgi'
|
||||
}
|
||||
'Debian': {
|
||||
$common_package_name = 'aodh-common'
|
||||
$psycopg_package_name = 'python-psycopg2'
|
||||
$sqlite_package_name = 'python-pysqlite2'
|
||||
$api_package_name = 'aodh-api'
|
||||
$api_service_name = 'aodh-api'
|
||||
$notifier_package_name = 'aodh-notifier'
|
||||
|
@ -40,6 +46,8 @@ class aodh::params {
|
|||
$expirer_service_name = 'aodh-expirer'
|
||||
$listener_package_name = 'aodh-listener'
|
||||
$listener_service_name = 'aodh-listener'
|
||||
$pymongo_package_name = 'python-pymongo'
|
||||
$pymysql_package_name = 'python-pymysql'
|
||||
$aodh_wsgi_script_path = '/usr/lib/cgi-bin/aodh'
|
||||
$aodh_wsgi_script_source = '/usr/share/aodh-common/app.wsgi'
|
||||
}
|
||||
|
|
|
@ -35,5 +35,5 @@ class aodh::policy (
|
|||
}
|
||||
|
||||
create_resources('openstacklib::policy::base', $policies)
|
||||
oslo::policy { 'aodh_config': policy_file => $policy_path }
|
||||
|
||||
}
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
features:
|
||||
- Switch to puppet-oslo resource usage (instead of
|
||||
manual configuration file editing).
|
|
@ -20,7 +20,6 @@ describe 'aodh::policy' do
|
|||
:key => 'context_is_admin',
|
||||
:value => 'foo:bar'
|
||||
})
|
||||
is_expected.to contain_aodh_config('oslo_policy/policy_file').with_value('/etc/aodh/policy.json')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue