From 28a867e442ac7ec102d72f222a2b2b4c75d17320 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Thu, 27 Aug 2015 14:40:24 -0500 Subject: [PATCH] Initial Liberty Changes Metadata changes - Updated maintainer email - Updated the version remvoe db2 refs Change-Id: I5fe98b00fc82ae36d217e62b0b1de46af6070368 --- metadata.rb | 8 ++++---- spec/default-redhat_spec.rb | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/metadata.rb b/metadata.rb index 6b1044ff..6b7fbfc3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,11 +1,11 @@ # Encoding: utf-8 name 'openstack-network' 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 OpenStack Network API Service and various agents and plugins' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '11.0.0' +version '12.0.0' recipe 'openstack-network::client', 'Install packages required for network client' recipe 'openstack-network::server', 'Installs packages required for a OpenStack Network server' recipe 'openstack-network::openvswitch', 'Installs packages required for OVS' @@ -18,5 +18,5 @@ recipe 'openstack-network::hyperv', 'Installs packages required for OpenStack Ne 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' diff --git a/spec/default-redhat_spec.rb b/spec/default-redhat_spec.rb index 1cb05d1a..18fcced4 100644 --- a/spec/default-redhat_spec.rb +++ b/spec/default-redhat_spec.rb @@ -17,14 +17,6 @@ describe 'openstack-network' do expect(chef_run).to upgrade_package('MySQL-python') end - it 'upgrades db2 python packages if explicitly told' do - node.set['openstack']['db']['network']['service_type'] = 'db2' - - ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg| - expect(chef_run).to upgrade_package(pkg) - end - end - describe 'ml2_conf.ini' do let(:file) { chef_run.template('/etc/neutron/plugins/ml2/ml2_conf.ini') }