Remove Berksfile.lock from dev branches

blueprint remove-berksfile-lock-from-dev-branches

Change-Id: I5648bc0fb5824823283149dd47f1727cc6b75f19

.gitignore

@@ -8,3 +8,4 @@ cookbooks/
 .vagrant
 *.swp
 .coverage/
+Berksfile.lock

Berksfile.lock

@@ -1,41 +0,0 @@
-{
-  "sources": {
-    "openstack-network": {
-      "path": "."
-    },
-    "openstack-identity": {
-      "locked_version": "8.0.0",
-      "git": "https://github.com/stackforge/cookbook-openstack-identity.git",
-      "ref": "309b8040a03d4bde97ca443644125e16c242edd8"
-    },
-    "openstack-common": {
-      "locked_version": "8.0.0",
-      "git": "https://github.com/stackforge/cookbook-openstack-common.git",
-      "ref": "bf7f7bc3f2f8a1db112afd790aa54998a6cde40f"
-    },
-    "database": {
-      "locked_version": "1.4.0"
-    },
-    "mysql": {
-      "locked_version": "3.0.0"
-    },
-    "postgresql": {
-      "locked_version": "3.3.4"
-    },
-    "apt": {
-      "locked_version": "2.3.4"
-    },
-    "build-essential": {
-      "locked_version": "1.4.2"
-    },
-    "openssl": {
-      "locked_version": "1.1.0"
-    },
-    "aws": {
-      "locked_version": "1.0.0"
-    },
-    "xfs": {
-      "locked_version": "1.1.0"
-    }
-  }
-}

README.md

@@ -95,6 +95,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
 ==================