From 182392cf5d3430c6bee3ac2b63df9f20b08e20bc Mon Sep 17 00:00:00 2001 From: Terri Haber Date: Fri, 27 Feb 2015 16:09:01 -0800 Subject: [PATCH] more doc improvements, sleep in the provision --- Readme.md | 8 ++++++++ provision/bootstrap_r10k.sh | 3 +++ 2 files changed, 11 insertions(+) diff --git a/Readme.md b/Readme.md index 03e5da6..b276a08 100644 --- a/Readme.md +++ b/Readme.md @@ -46,6 +46,8 @@ Contains the scripts and files that are used to spin up the Vagrant VM. This is If you want to avoid having to wait for PE to download during the provisioning process and you have the Puppet Enterprise tarball lying around, just copy it over to provision/pe and that step will be skipped. +The provision/provision.sh script contains the PE version that will be installed. You'll need to change it to downgrade/upgrade as needed. + ### reference/ Reference materials for Puppet workflow. @@ -126,6 +128,12 @@ is done for the role. Classification for vagrant nodes are done via the environment-specific `site.pp` +#### Vagrant usage + +r10k on the vagrant xmaster uses the /vagrant mount as the remote. During the course of your testing, if you need to edit your files, you'll need to add and commit your changes (but don't push!) then use r10k to sync your code on your vagrant xmaster: + +r10k deploy environmnet -p --verbose + ## Bootstrapping your Puppet Master Now that you have your basic puppet code all ready to go and you want to launch this on your live master... diff --git a/provision/bootstrap_r10k.sh b/provision/bootstrap_r10k.sh index 14a7432..45b6f56 100755 --- a/provision/bootstrap_r10k.sh +++ b/provision/bootstrap_r10k.sh @@ -25,5 +25,8 @@ echo "APPLYING R10K" /opt/puppet/bin/r10k deploy environment -p production --puppetfile \ --verbose debug +echo "Sleeping for 10 seconds while prod env is recognized" + +sleep 10 /opt/puppet/bin/puppet agent -t