Icehouse branch version updates
* also cleanup unused database dependencies Change-Id: I8874699feb02c55aad2c7d90bfe99406abd73f52
This commit is contained in:
parent
967839cfba
commit
8dec4d04a8
@ -2,5 +2,3 @@ metadata
|
||||
|
||||
cookbook 'openstack-identity', :git => 'https://github.com/stackforge/cookbook-openstack-identity.git'
|
||||
cookbook 'openstack-common', :git => 'https://github.com/stackforge/cookbook-openstack-common.git'
|
||||
cookbook 'database'
|
||||
cookbook 'mysql'
|
@ -1,6 +1,8 @@
|
||||
# CHANGELOG for cookbook-openstack-network
|
||||
|
||||
This file is used to list changes made in each version of cookbook-openstack-network.
|
||||
## 9.0.0
|
||||
* Upgrade to Icehouse
|
||||
|
||||
## 8.5.1
|
||||
### Bug
|
||||
|
@ -5,7 +5,7 @@ maintainer 'Jay Pipes <jaypipes@gmail.com>'
|
||||
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 '8.5.1'
|
||||
version '9.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'
|
||||
@ -16,7 +16,5 @@ recipe 'openstack-network::identity_registration', 'Registers OpenSta
|
||||
supports os
|
||||
end
|
||||
|
||||
depends 'openstack-identity', '~> 8.0'
|
||||
depends 'openstack-common', '~> 8.2'
|
||||
depends 'mysql'
|
||||
depends 'postgresql'
|
||||
depends 'openstack-identity', '~> 9.0'
|
||||
depends 'openstack-common', '~> 9.0'
|
||||
|
@ -41,7 +41,7 @@ platform_options['neutron_server_packages'].each do |pkg|
|
||||
end
|
||||
|
||||
# Migrate network database
|
||||
# If the database has never migrated, make the current version of alembic_version to havana,
|
||||
# If the database has never migrated, make the current version of alembic_version to Icehouse,
|
||||
# else migrate the database to latest version.
|
||||
# The node['openstack']['network']['plugin_config_file'] attribute is set in the common.rb recipe
|
||||
|
||||
@ -52,7 +52,7 @@ bash 'migrate network database' do
|
||||
current_version_line=`#{migrate_command} current 2>&1 | tail -n 1`
|
||||
# determine if the $current_version_line ends with ": None"
|
||||
if [[ $current_version_line == *:\\ None ]]; then
|
||||
#{migrate_command} stamp havana
|
||||
#{migrate_command} stamp icehouse
|
||||
else
|
||||
#{migrate_command} upgrade head
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user