Remove policy.json file
The policy file is just a dup of what's already in the distro packages. Until the cookbooks/chef support a policy type resource duping them does not make sense and causes churn to keep in sync with base openstack code. Change-Id: Ib09d5efdf3927a381501eebd78d5c4db5133f057 Implements: blueprint remove-policy-templates Closes-Bug: #1324187
This commit is contained in:
parent
0d04a07734
commit
e2d00ef7a7
|
@ -1,6 +1,9 @@
|
||||||
openstack-telemetry Cookbook CHANGELG
|
openstack-telemetry Cookbook CHANGELG
|
||||||
==============================
|
==============================
|
||||||
This file is used to list changes made in each version of the openstack-metering cookbook.
|
This file is used to list changes made in each version of the openstack-metering cookbook.
|
||||||
|
## 9.1.1
|
||||||
|
* Remove policy.json file, it's just a dup of what's in the package
|
||||||
|
|
||||||
## 9.1.0
|
## 9.1.0
|
||||||
### Blue print
|
### Blue print
|
||||||
# Add recipes for the ceilometer alarm services (alarm-services)
|
# Add recipes for the ceilometer alarm services (alarm-services)
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"context_is_admin": [["role:admin"]]
|
|
||||||
}
|
|
|
@ -4,7 +4,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
|
||||||
license 'Apache 2.0'
|
license 'Apache 2.0'
|
||||||
description 'The OpenStack Metering service Ceilometer.'
|
description 'The OpenStack Metering service Ceilometer.'
|
||||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||||
version '9.1.0'
|
version '9.1.1'
|
||||||
|
|
||||||
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
|
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
|
||||||
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
|
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
|
||||||
|
|
|
@ -102,10 +102,3 @@ template node['openstack']['telemetry']['conf'] do
|
||||||
api_bind_port: telemetry_api_bind.port
|
api_bind_port: telemetry_api_bind.port
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
cookbook_file '/etc/ceilometer/policy.json' do
|
|
||||||
source 'policy.json'
|
|
||||||
mode 00640
|
|
||||||
owner node['openstack']['telemetry']['user']
|
|
||||||
group node['openstack']['telemetry']['group']
|
|
||||||
end
|
|
||||||
|
|
|
@ -177,17 +177,5 @@ describe 'openstack-telemetry::common' do
|
||||||
/^port = 9999$/)
|
/^port = 9999$/)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'policy.json' do
|
|
||||||
let(:file) { chef_run.cookbook_file('/etc/ceilometer/policy.json') }
|
|
||||||
|
|
||||||
it 'installs the /etc/ceilometer/policy.json file' do
|
|
||||||
expect(chef_run).to create_cookbook_file(file.name).with(
|
|
||||||
user: 'ceilometer',
|
|
||||||
group: 'ceilometer',
|
|
||||||
mode: 0640
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue