From 26aae7f49fc9cae1a344dc15f4a5eb9ed3d02f62 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Fri, 9 Jan 2015 14:36:09 -0800
Subject: [PATCH] Document how to disable/enable puppet

Change-Id: Id1f86c52727bac2403261083b55d89ab487fea10
---
 doc/source/sysadmin.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst
index 12aba66bd7..f5deaa3999 100644
--- a/doc/source/sysadmin.rst
+++ b/doc/source/sysadmin.rst
@@ -277,6 +277,21 @@ for detailed instructions.
 
 .. _cinder:
 
+Disable/Enable Puppet
+=====================
+
+You should normally not make manual changes to servers, but instead,
+make changes through puppet.  However, under some circumstances, you
+may need to temporarily make a manual change to a puppet-managed
+resource on a server.  In that case, run the following command on that
+server to disable puppet::
+
+  sudo puppet agent --disable
+
+When you are ready for puppet to run again, use::
+
+  sudo puppet agent --enable
+
 Cinder Volume Management
 ========================