diff --git a/metadata.rb b/metadata.rb index 9daeb0a..4744dfc 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/spec/api-rhel_spec.rb b/spec/api-rhel_spec.rb index 3d3d729..9c49e4a 100644 --- a/spec/api-rhel_spec.rb +++ b/spec/api-rhel_spec.rb @@ -16,7 +16,7 @@ describe 'openstack-telemetry::api' do user: 'ceilometer', group: 'ceilometer', mode: 0700 - ) + ) end it 'installs the api package' do diff --git a/spec/api_spec.rb b/spec/api_spec.rb index ea6c2a6..095cf43 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -16,7 +16,7 @@ describe 'openstack-telemetry::api' do user: 'ceilometer', group: 'ceilometer', mode: 0700 - ) + ) end it 'installs the api package' do diff --git a/spec/common-rhel_spec.rb b/spec/common-rhel_spec.rb index ab60a60..ddbdc3d 100644 --- a/spec/common-rhel_spec.rb +++ b/spec/common-rhel_spec.rb @@ -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' diff --git a/spec/common_spec.rb b/spec/common_spec.rb index 451bbab..b9303a0 100644 --- a/spec/common_spec.rb +++ b/spec/common_spec.rb @@ -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