diff --git a/.gitignore b/.gitignore index 52cdcbc..4a9da27 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .bundle/ .cookbooks/ .kitchen +Berksfile.lock diff --git a/Berksfile.lock b/Berksfile.lock deleted file mode 100644 index bf5f86b..0000000 --- a/Berksfile.lock +++ /dev/null @@ -1,55 +0,0 @@ -{ - "sources": { - "openstack-block-storage": { - "path": "." - }, - "openstack-image": { - "locked_version": "8.0.0", - "git": "git://github.com/stackforge/cookbook-openstack-image.git", - "ref": "2be8d1e01789f4e7a3fc7b6f8a2f43df3fae59c5" - }, - "openstack-identity": { - "locked_version": "8.0.0", - "git": "git://github.com/stackforge/cookbook-openstack-identity.git", - "ref": "f4925084e583c29cb9007d9f2e1894761db264ef" - }, - "openstack-common": { - "locked_version": "8.0.1", - "git": "git://github.com/stackforge/cookbook-openstack-common.git", - "ref": "5e7592dc180bc30348afe7b1ecb3328d0fbacc5e" - }, - "apt": { - "locked_version": "2.3.4" - }, - "selinux": { - "locked_version": "0.6.2" - }, - "python": { - "locked_version": "1.4.4" - }, - "build-essential": { - "locked_version": "1.4.2" - }, - "yum": { - "locked_version": "3.0.2" - }, - "database": { - "locked_version": "1.6.0" - }, - "mysql": { - "locked_version": "4.0.14" - }, - "openssl": { - "locked_version": "1.1.0" - }, - "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 fb04216..bd9c767 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,17 @@ 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 ==================