Updated berkshelf to 3.1.5
Updated berkshelf from 2.0.18 to 3.1.5 in Gemfile and added supermarket source to Berksfile and locked apache cookbook to '< 2.0.0' Change-Id: I4426d4a2f4367994dc9e66f51ae288c617a6a16b Implements: blueprint update-berkshelf
This commit is contained in:
parent
8da94fbd37
commit
5878de34d9
|
@ -1,4 +1,6 @@
|
||||||
|
source "https://supermarket.getchef.com"
|
||||||
|
|
||||||
metadata
|
metadata
|
||||||
|
|
||||||
cookbook "openstack-common",
|
cookbook "openstack-common",
|
||||||
git: "git://github.com/stackforge/cookbook-openstack-common.git"
|
github: "stackforge/cookbook-openstack-common"
|
||||||
|
|
|
@ -4,6 +4,7 @@ This file is used to list changes made in each version of the openstack-dashboar
|
||||||
|
|
||||||
## 10.0.0
|
## 10.0.0
|
||||||
* Upgrading to Juno
|
* Upgrading to Juno
|
||||||
|
* Upgrading berkshelf from 2.0.18 to 3.1.5
|
||||||
|
|
||||||
## 9.1
|
## 9.1
|
||||||
* python_packages database client attributes have been moved to the -common cookbook
|
* python_packages database client attributes have been moved to the -common cookbook
|
||||||
|
|
2
Gemfile
2
Gemfile
|
@ -2,7 +2,7 @@ source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'chef', '~> 11.12.0'
|
gem 'chef', '~> 11.12.0'
|
||||||
gem 'json', '<= 1.7.7' # chef 11 dependency
|
gem 'json', '<= 1.7.7' # chef 11 dependency
|
||||||
gem 'berkshelf', '~> 2.0.18'
|
gem 'berkshelf', '~> 3.1.5'
|
||||||
gem 'hashie', '~> 2.0'
|
gem 'hashie', '~> 2.0'
|
||||||
gem 'chefspec', '~> 4.0.0'
|
gem 'chefspec', '~> 4.0.0'
|
||||||
gem 'rspec', '~> 3.0.0'
|
gem 'rspec', '~> 3.0.0'
|
||||||
|
|
|
@ -11,7 +11,7 @@ To run all of the tests with Strainer:
|
||||||
Or you may run the tests individually:
|
Or you may run the tests individually:
|
||||||
|
|
||||||
$ bundle install --path=.bundle # install gem dependencies
|
$ bundle install --path=.bundle # install gem dependencies
|
||||||
$ bundle exec berks install --path=.cookbooks # install cookbook dependencies
|
$ bundle exec berks vendor .cookbooks # install cookbook dependencies and create the folder .cookbooks
|
||||||
$ bundle exec strainer test -s Strainerfile # run tests
|
$ bundle exec strainer test -s Strainerfile # run tests
|
||||||
|
|
||||||
## Rubocop ##
|
## Rubocop ##
|
||||||
|
|
|
@ -12,5 +12,5 @@ recipe 'openstack-dashboard::server', 'Sets up the Horizon dashboard w
|
||||||
supports os
|
supports os
|
||||||
end
|
end
|
||||||
|
|
||||||
depends 'apache2', '>= 1.9.6'
|
depends 'apache2', '< 2.0.0'
|
||||||
depends 'openstack-common', '~> 10.0'
|
depends 'openstack-common', '~> 10.0'
|
||||||
|
|
Loading…
Reference in New Issue