Setting up repo for master Juno Branch

* Adding Gemfile.lock to .gitignore
* Updating Gems
  * chef (11.12.0)

Change-Id: I7baf4f98780acc4dfee8b07466d8ecacbfee52d7
Partial-Bug: 1349865
This commit is contained in:
Mark Vanderwiel 2014-08-01 12:17:04 -05:00
parent 7dc5d51fca
commit b38b800d1b
5 changed files with 10 additions and 6 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ berks.json
.kitchen
.zero-knife.rb
Berksfile.lock
Gemfile.lock

View File

@ -4,10 +4,11 @@ cookbook 'apache2', '1.9.6'
cookbook 'apt', '2.3.8'
cookbook 'aws', '2.1.1'
cookbook 'build-essential', '1.4.2'
cookbook 'database', '2.0.0'
cookbook 'database', '2.2.0'
cookbook 'erlang', '1.4.2'
cookbook 'memcached', '1.7.2'
cookbook 'mysql', '4.1.2'
cookbook 'mysql', '5.3.6'
cookbook 'mysql-chef_gem', '0.0.2'
cookbook 'openssl', '1.1.0'
cookbook 'postgresql', '3.3.4'
cookbook 'python', '1.4.6'

View File

@ -1,6 +1,9 @@
# CHANGELOG for openstack-chef-repo
This file is used to list changes made in each version of openstack-chef-repo
## 10.0.0
* Update to Juno
## 9.1.0
* Bump berkshelf to 2.0.18

View File

@ -1,9 +1,8 @@
source "https://rubygems.org"
gem "chef", "~> 11.6.2"
gem "chef", "~> 11.12.0"
gem "json", "<= 1.7.7" # chef dependency
gem "knife-block", "~> 0.0.6"
gem "spiceweasel", "~> 2.6.0"
gem "berkshelf", "~> 2.0.18"
gem "hashie", "~> 2.0"
gem "rspec", "~> 2.14.1"

View File

@ -1,8 +1,8 @@
# Description #
This repository contains examples of the roles, environments and other supporting files for deploying an OpenStack **Icehouse** reference architecture using Chef. This currently includes all OpenStack core projects: Compute, Dashboard, Identity, Image, Network, Object Storage, Block Storage, Telemetry and Orchestration.
This repository contains examples of the roles, environments and other supporting files for deploying an OpenStack **Juno** reference architecture using Chef. This currently includes all OpenStack core projects: Compute, Dashboard, Identity, Image, Network, Object Storage, Block Storage, Telemetry and Orchestration.
Development of the latest Stable release will continue on the `master` branch and releases tagged with `9.0.X`. Once development starts against OpenStack `master` or `juno`, this branch will move to `stable/icehouse` and the appropriate branches will continue development.
Development of the latest OpenStack release will continue on the `master` branch and releases tagged with `10.0.X`. Once development starts against OpenStack `k' release, this branch will move to `stable/juno` and the appropriate branches will continue development.
The documentation has been moved to the https://github.com/mattray/chef-docs repository for merging to https://github.com/opscode/chef-docs and eventual release to https://docs.opscode.com. Instructions for building the docs are included in the repository. There is additional documentation on the [OpenStack wiki](https://wiki.openstack.org/wiki/Chef/GettingStarted).