Remove Berksfile.lock from dev branches

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

Change-Id: I16763286632d468f3dbea28750b9ecfee75533cf

.gitignore

@@ -1,2 +1,3 @@
 .bundle/
 .cookbooks/
+Berksfile.lock

Berksfile.lock

@@ -1,83 +0,0 @@
-{
-  "sources": {
-    "openstack-ops-database": {
-      "path": "."
-    },
-    "openstack-block-storage": {
-      "locked_version": "7.2.2",
-      "git": "git://github.com/stackforge/cookbook-openstack-block-storage.git",
-      "ref": "38c8aa5c7a99c913b5969045038f2c82a582f098"
-    },
-    "openstack-common": {
-      "locked_version": "8.0.0",
-      "git": "git://github.com/stackforge/cookbook-openstack-common.git",
-      "ref": "2201bd113ffe1742c19811aa4df59a5790af71e3"
-    },
-    "openstack-compute": {
-      "locked_version": "7.3.0",
-      "git": "git://github.com/stackforge/cookbook-openstack-compute.git",
-      "ref": "37621e56fc762636306d6acf0d5cac9858e5ca14"
-    },
-    "openstack-dashboard": {
-      "locked_version": "7.0.0",
-      "git": "git://github.com/stackforge/cookbook-openstack-dashboard.git",
-      "ref": "814fcd913dd476ac1362496811a8f156437295eb"
-    },
-    "openstack-identity": {
-      "locked_version": "8.0.0",
-      "git": "git://github.com/stackforge/cookbook-openstack-identity.git",
-      "ref": "3b001b7e07758e2c81b5ae4d1bff8e4a1472b24a"
-    },
-    "openstack-image": {
-      "locked_version": "7.1.1",
-      "git": "git://github.com/stackforge/cookbook-openstack-image.git",
-      "ref": "46c86ac9f929613d3b1046a7be587329dbf22845"
-    },
-    "openstack-network": {
-      "locked_version": "8.0.0",
-      "git": "git://github.com/stackforge/cookbook-openstack-network.git",
-      "ref": "6cda0639c35d1a94ff23d703fd71d3f134a5be86"
-    },
-    "openstack-metering": {
-      "locked_version": "7.1.1",
-      "git": "git://github.com/stackforge/cookbook-openstack-metering.git",
-      "ref": "461f3102d01ee46707780b6acbb8e56d0bfb92f6"
-    },
-    "database": {
-      "locked_version": "1.4.0"
-    },
-    "mysql": {
-      "locked_version": "3.0.0"
-    },
-    "openssl": {
-      "locked_version": "1.0.2"
-    },
-    "build-essential": {
-      "locked_version": "1.4.0"
-    },
-    "postgresql": {
-      "locked_version": "3.0.2"
-    },
-    "apt": {
-      "locked_version": "2.0.0"
-    },
-    "aws": {
-      "locked_version": "0.101.2"
-    },
-    "xfs": {
-      "locked_version": "1.1.0"
-    },
-    "selinux": {
-      "locked_version": "0.5.6"
-    },
-    "python": {
-      "locked_version": "1.3.6"
-    },
-    "yum": {
-      "locked_version": "2.3.0"
-    },
-    "apache2": {
-      "locked_version": "1.8.4"
-    }
-  }
-}

README.md

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