Initial Liberty Changes

Metadata changes
- Updated maintainer email
- Updated the version

rubocop update
remove db2 refs

Change-Id: I9eb4afd32d777f99e22a2860bbded489790b6f9c
This commit is contained in:
JJ Asghar 2015-08-27 16:00:35 -05:00 committed by Mark Vanderwiel
parent 17bd6c9c7c
commit 3596f64911
3 changed files with 5 additions and 13 deletions

View File

@ -1,10 +1,10 @@
name 'openstack-image'
maintainer 'openstack-chef'
maintainer_email 'opscode-chef-openstack@googlegroups.com'
maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache 2.0'
description 'Installs and configures the Glance Image Registry and Delivery Service'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '11.0.0'
version '12.0.0'
recipe 'openstack-image::api', 'Installs packages required for a glance api server'
recipe 'openstack-image::client', 'Install packages required for glance client'
recipe 'openstack-image::registry', 'Installs packages required for a glance registry server'
@ -15,6 +15,6 @@ recipe 'openstack-image::image_upload', 'Upload image using glance image-create
supports os
end
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'
depends 'openstack-common', '>= 12.0.0'
depends 'openstack-identity', '>= 12.0.0'
depends 'ceph', '~> 0.8.0'

View File

@ -81,7 +81,7 @@ describe 'openstack-image::identity_registration' do
endpoint_adminurl: 'http://127.0.0.1:9292',
endpoint_internalurl: internal_url,
endpoint_publicurl: 'http://127.0.0.1:9292'
)
)
end
it 'with different admin,internal,public urls' do

View File

@ -25,14 +25,6 @@ describe 'openstack-image::registry' do
expect(chef_run).to upgrade_package('MySQL-python')
end
it 'upgrades db2 python packages if explicitly told' do
node.set['openstack']['db']['image']['service_type'] = 'db2'
['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
expect(chef_run).to upgrade_package(pkg)
end
end
it 'upgrades glance packages' do
expect(chef_run).to upgrade_package('openstack-glance')
expect(chef_run).to upgrade_package('cronie')