Initial Liberty Changes

Metadata changes
- Updated maintainer email
- Updated the version

rubocop updates. remove db2 reference

Change-Id: I116801590b438d49f042aa70d94a6fa84670afc5
This commit is contained in:
JJ Asghar 2015-08-27 16:38:26 -05:00 committed by Samuel Cassiba
parent 76ba93e362
commit 495ae4a088
5 changed files with 11 additions and 18 deletions

View File

@ -1,10 +1,10 @@
name 'openstack-telemetry'
maintainer 'openstack-chef'
maintainer_email 'opscode-chef-openstack@googlegroups.com'
maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache 2.0'
description 'The OpenStack Metering service Ceilometer.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '11.0.0'
version '12.0.0'
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
@ -21,6 +21,6 @@ recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, t
supports os
end
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'
depends 'openstack-compute', '>= 11.0.0'
depends 'openstack-common', '>= 12.0.0'
depends 'openstack-identity', '>= 12.0.0'
depends 'openstack-compute', '>= 12.0.0'

View File

@ -16,7 +16,7 @@ describe 'openstack-telemetry::api' do
user: 'ceilometer',
group: 'ceilometer',
mode: 0700
)
)
end
it 'installs the api package' do

View File

@ -16,7 +16,7 @@ describe 'openstack-telemetry::api' do
user: 'ceilometer',
group: 'ceilometer',
mode: 0700
)
)
end
it 'installs the api package' do

View File

@ -14,13 +14,6 @@ describe 'openstack-telemetry::common' do
expect(chef_run).to upgrade_package 'MySQL-python'
end
it 'installs db2 python packages if explicitly told' do
node.set['openstack']['db']['telemetry']['service_type'] = 'db2'
['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'installs postgresql python packages if explicitly told' do
node.set['openstack']['db']['telemetry']['service_type'] = 'postgresql'
expect(chef_run).to upgrade_package 'python-psycopg2'

View File

@ -41,7 +41,7 @@ describe 'openstack-telemetry::common' do
user: 'ceilometer',
group: 'ceilometer',
mode: 0750
)
)
end
end
@ -53,7 +53,7 @@ describe 'openstack-telemetry::common' do
user: 'ceilometer',
group: 'ceilometer',
mode: 0640
)
)
end
it 'has default values' do
@ -112,7 +112,7 @@ describe 'openstack-telemetry::common' do
/^rabbit_password = mq-pass$/,
/^rabbit_port = 5672$/,
/^rabbit_host = 127.0.0.1$/,
/^rabbit_virtual_host = \/$/,
%r{^rabbit_virtual_host = /$},
/^rabbit_max_retries = 0$/,
/^rabbit_retry_interval = 1$/
].each do |line|
@ -139,7 +139,7 @@ describe 'openstack-telemetry::common' do
/^rabbit_password = mq-pass$/,
/^rabbit_hosts = 1.1.1.1:5672,2.2.2.2:5672$/,
/^rabbit_ha_queues = True$/,
/^rabbit_virtual_host = \/$/
%r{^rabbit_virtual_host = /$}
].each do |line|
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
end