Remove Berksfile.lock

Berksfile.lock is not updated so points to old versions of each of the
stackforge cookbooks. Removing this file ensures that a user gets the
most recent stackforge cookbooks when installing with berkshelf.

Add Berksfile.lock to .gitignore so that another version isn't
committed.

Update Readme with note about Berksfile.lock

Change-Id: I8ea3223e98ac4dbab94e45f2323c6dcea2b54504
This commit is contained in:
Hugh Saunders 2014-01-17 14:34:55 +00:00
parent 233b103c53
commit ae1c001286
3 changed files with 2 additions and 126 deletions

1
.gitignore vendored
View File

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

View File

@ -1,125 +0,0 @@
{
"sources": {
"apache2": {
"locked_version": "1.8.4"
},
"apt": {
"locked_version": "2.2.0"
},
"aws": {
"locked_version": "0.101.6"
},
"build-essential": {
"locked_version": "1.4.2"
},
"database": {
"locked_version": "1.5.2"
},
"erlang": {
"locked_version": "1.3.2"
},
"memcached": {
"locked_version": "1.6.0"
},
"mysql": {
"locked_version": "3.0.12"
},
"openssl": {
"locked_version": "1.1.0"
},
"postgresql": {
"locked_version": "3.1.0"
},
"rabbitmq": {
"locked_version": "2.3.0"
},
"xfs": {
"locked_version": "1.1.0"
},
"yum": {
"locked_version": "2.3.4"
},
"openstack-block-storage": {
"locked_version": "7.0.3",
"git": "git://github.com/stackforge/cookbook-openstack-block-storage.git",
"ref": "bc00347db1b4e12caca5ccb21b1ec93237637d5c"
},
"openstack-common": {
"locked_version": "0.4.3",
"git": "git://github.com/stackforge/cookbook-openstack-common.git",
"ref": "eb5eed7126b6a6efbaf803e8a594d610cf661e97"
},
"openstack-compute": {
"locked_version": "7.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-compute.git",
"ref": "aa42f5c09a445cde7267e4b4d00a6ce893aa481e"
},
"openstack-dashboard": {
"locked_version": "7.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-dashboard.git",
"ref": "e2012544fdacac355a713e548cbe1f60c7aed887"
},
"openstack-identity": {
"locked_version": "7.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-identity.git",
"ref": "2e6b8b9c6788ae28fbc362c77c53a51c040b49a6"
},
"openstack-image": {
"locked_version": "7.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-image.git",
"ref": "722a973a09ef7c2d58ac010cd0659ca48a81c266"
},
"openstack-metering": {
"locked_version": "7.0.4",
"git": "git://github.com/stackforge/cookbook-openstack-metering.git",
"ref": "6ba0451ca2c66562fe6c40db053312c05ef03b15"
},
"openstack-network": {
"locked_version": "7.0.3",
"git": "git://github.com/stackforge/cookbook-openstack-network.git",
"ref": "b2b237a78c755492b9e51110704da900257a666d"
},
"openstack-object-storage": {
"locked_version": "7.0.10",
"git": "git://github.com/stackforge/cookbook-openstack-object-storage.git",
"ref": "2a522aedfb1f9fc0fc23b1b394309e76404d88f9"
},
"openstack-ops-database": {
"locked_version": "7.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-ops-database.git",
"ref": "cf8e48039bef2a6ff3a8215cd5a79d8193d6cefd"
},
"openstack-ops-messaging": {
"locked_version": "7.0.0",
"git": "git://github.com/stackforge/cookbook-openstack-ops-messaging.git",
"ref": "d57a3c64e09cd5e5ce7bcbf0cb84c9bbf67cab9a"
},
"runit": {
"locked_version": "1.3.0"
},
"selinux": {
"locked_version": "0.5.6"
},
"python": {
"locked_version": "1.4.0"
},
"sysctl": {
"locked_version": "0.3.3"
},
"statsd": {
"locked_version": "0.0.1"
},
"git": {
"locked_version": "2.7.0"
},
"dmg": {
"locked_version": "2.0.4"
},
"windows": {
"locked_version": "1.11.0"
},
"chef_handler": {
"locked_version": "1.1.4"
}
}
}

View File

@ -8,7 +8,7 @@ The documentation has been moved to the https://github.com/mattray/chef-docs rep
# Usage #
This repository uses Berkshelf (https://berkshelf.com) to manage downloading all of the proper cookbook versions, whether from Git or from the Opscode Community site (https://community.opscode.com). The preference is to eventually upstream all cookbook dependencies to the Opscode Community site. The [Berksfile](Berksfile) lists the current dependencies.
This repository uses Berkshelf (https://berkshelf.com) to manage downloading all of the proper cookbook versions, whether from Git or from the Opscode Community site (https://community.opscode.com). The preference is to eventually upstream all cookbook dependencies to the Opscode Community site. The [Berksfile](Berksfile) lists the current dependencies. Note that berks will resolve version requirements and dependencies on first run and store these in Berksfile.lock. If new cookbooks become available you can run `berks update` to update the references in Berksfile.lock. Berksfile.lock will be included in stable branches to provide a known good set of dependencies. Berksfile.lock will not be included in development branches to encourage development against the latest cookbooks.
There is a Spiceweasel (http://bit.ly/spcwsl) [infrastructure.yml](infrastructure.yml) manifest documenting all the roles and environments required to deploy OpenStack.