openstack
/
fuel-library
Code Issues Proposed changes

Temporarily remove policy configuration 

We need to temporarily remove the policy configuration for aodh so it
can be correctly moved to the upstream.  This change will be a
depends-on for the upstream change so we don't break deployments
accidently.

Change-Id: I4e24d49ed7e84a3b5cb991e912ed320c393569e4
Closes-Bug: #1570109
This commit is contained in:
Alex Schultz 2016-04-13 15:57:56 -06:00 committed by Bogdan Dobrelya
parent 81e9839829
commit e38522173b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,6 @@ class openstack_tasks::aodh::aodh {
auth_endpoint_type => 'internalURL',
}
aodh_config { 'oslo_policy/policy_file' : value => '/etc/aodh/policy.json'; }
aodh_config { 'notification/store_events': value => true; }
if $debug {

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

@ -78,7 +78,8 @@ describe manifest do
end
it 'should configure oslo_policy/policy_file, notification/store_events, api/pecan_debug' do
should contain_aodh_config('oslo_policy/policy_file').with(:value => oslo_policy_file)
# TODO(aschultz): uncomment when this gets merged in upstream aodh module LP#1570109
#should contain_aodh_config('oslo_policy/policy_file').with(:value => oslo_policy_file)
should contain_aodh_config('notification/store_events').with(:value => notification_store_events)
end