diff --git a/.gitignore b/.gitignore index e92db3f..3737739 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .bundle/ .cookbooks/ +Berksfile.lock diff --git a/Berksfile.lock b/Berksfile.lock deleted file mode 100644 index 3efa04b..0000000 --- a/Berksfile.lock +++ /dev/null @@ -1,41 +0,0 @@ -{ - "sources": { - "openstack-metering": { - "path": "." - }, - "openstack-common": { - "locked_version": "8.0.0", - "git": "git://github.com/stackforge/cookbook-openstack-common.git", - "ref": "d5f852daf5d0f3001ddbf1688c43a4bb21e8ca00" - }, - "openstack-identity": { - "locked_version": "8.0.0", - "git": "git://github.com/stackforge/cookbook-openstack-identity.git", - "ref": "3b001b7e07758e2c81b5ae4d1bff8e4a1472b24a" - }, - "apt": { - "locked_version": "2.3.4" - }, - "database": { - "locked_version": "1.6.0" - }, - "mysql": { - "locked_version": "4.0.14" - }, - "openssl": { - "locked_version": "1.1.0" - }, - "build-essential": { - "locked_version": "1.4.2" - }, - "postgresql": { - "locked_version": "3.3.4" - }, - "aws": { - "locked_version": "1.0.0" - }, - "xfs": { - "locked_version": "1.1.0" - } - } -} diff --git a/README.md b/README.md index 8f73cb2..79fd586 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,16 @@ Testing Please refer to the [TESTING.md](TESTING.md) for instructions for testing the cookbook. +Berkshelf +===== + +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. + License and Author ==================