[whimsy] branch master updated: document zmanda client workaround

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  cfc7980   document zmanda client workaround
cfc7980 is described below

commit cfc7980dcf07e312a55149bcaed93566d1571509
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sun Apr 10 11:53:43 2016 -0400

    document zmanda client workaround
---
 DEPLOYMENT.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index a3763df..532be09 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -4,8 +4,7 @@ Deployment
 The contents of this repository are deployed to the following VM:
 https://whimsy.apache.org/.
 
-The new VM is based on Ubuntu 14.04 (the current Whimsy is based on Ubuntu
-12.04), and is more completely managed by Puppet.  The puppet definition is
+This VM is based on Ubuntu 14.04 and is managed by Puppet.  The puppet definition is
 contained in the following files:
 
  * https://github.com/apache/infrastructure-puppet/blob/deployment/data/nodes/whimsy-vm2.apache.org.yaml
@@ -16,9 +15,14 @@ contained in the following files:
 
  * https://github.com/apache/infrastructure-puppet/blob/deployment/modules/whimsy_server/manifests/procmail.pp
 
-Instructions:
+Instructions for local testing of deployment changes:
 
- * https://github.com/rubys/puppet-kitchen#readme
+ * https://github.com/apache/infrastructure-puppet-kitchen#readme
+   * addition to [Make modules useable](https://github.com/apache/infrastructure-puppet-kitchen#make-modules-useable) step:
+ 
+            rm -rf zmanda_asf
+            mkdir -p zmanda_asf/manifests
+            echo "class zmanda_asf::client (){}" > zmanda_asf/manifests/client.pp
 
  * https://github.com/apache/infrastructure-puppet/blob/deployment/modules/vhosts_whimsy/README.md
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].