BIGTOP-1603. Rename docker-puppet and vagrant-puppet to better indicate its function and difference

13 files changed, 3 insertions, 3 deletions

diff --git a/bigtop-deploy/puppet/README.md b/bigtop-deploy/puppet/README.md
index c76185ac..b2a8b6a2 100644
--- a/bigtop-deploy/puppet/README.md
+++ b/bigtop-deploy/puppet/README.md
@@ -30,7 +30,7 @@ If you have site.csv in /etc/puppet/config,
 
 Then you should use --confdir=/etc/puppet , and puppet finds the config dir underneath.
 
-As an end to end example, you can follow the vagrant-puppet recipes to see how to set up 
+As an end to end example, you can follow the vagrant-puppet-vm recipes to see how to set up
 
 a puppet managed bigtop hadoop installation.  Those examples are gauranteed to work and 
 
diff --git a/bigtop-deploy/vm/docker-puppet/.gitignore b/bigtop-deploy/vm/vagrant-puppet-docker/.gitignore
index 2cd389dc..2cd389dc 100644
--- a/bigtop-deploy/vm/docker-puppet/.gitignore
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/.gitignore
diff --git a/bigtop-deploy/vm/docker-puppet/Dockerfile b/bigtop-deploy/vm/vagrant-puppet-docker/Dockerfile
index 8e651261..8e651261 100644
--- a/bigtop-deploy/vm/docker-puppet/Dockerfile
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/Dockerfile
diff --git a/bigtop-deploy/vm/docker-puppet/README.md b/bigtop-deploy/vm/vagrant-puppet-docker/README.md
index 7848571a..6d609b6e 100644
--- a/bigtop-deploy/vm/docker-puppet/README.md
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/README.md
@@ -52,7 +52,7 @@ This has been verified on docker client 1.2.0, with api version 1.15, and vagran
 NOTE : SELinux can PREVENT you from ssh'ing into your docker container.
 As a brute force way to disable it  - remove it from vi /etc/sysconfig/docker arguments
 (fedora and centos may by default launch docker daemon with the --selinux-enabled option)!
-In the future, lets update this README with the RIGHT way to allow selinux without breaking 
+In the future, lets update this README with the RIGHT way to allow selinux without breaking
 ssh into a docker container!
 
 ```
@@ -63,7 +63,7 @@ docker pull bigtop/seed:centos-6.4
 Now, you can start your cluster:
 
 ```
-cd bigtop/bigtop-deploy/vm/docker-puppet
+cd bigtop/bigtop-deploy/vm/vagrant-puppet-docker
 ./docker-hadoop.sh --build-image --create 3
 ```
 In case of errors you can attempt running as root, or else, ping the mailing list.
diff --git a/bigtop-deploy/vm/docker-puppet/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile
index 3ec023bb..3ec023bb 100755
--- a/bigtop-deploy/vm/docker-puppet/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/Vagrantfile
diff --git a/bigtop-deploy/vm/docker-puppet/boot2docker/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet-docker/boot2docker/Vagrantfile
index 5913fec9..5913fec9 100644
--- a/bigtop-deploy/vm/docker-puppet/boot2docker/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/boot2docker/Vagrantfile
diff --git a/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
index 4b504b32..4b504b32 100755
--- a/bigtop-deploy/vm/docker-puppet/docker-hadoop.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/docker-hadoop.sh
diff --git a/bigtop-deploy/vm/docker-puppet/provision.sh b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
index da087c60..da087c60 100755
--- a/bigtop-deploy/vm/docker-puppet/provision.sh
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/provision.sh
diff --git a/bigtop-deploy/vm/docker-puppet/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
index 6a53d020..6a53d020 100644
--- a/bigtop-deploy/vm/docker-puppet/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-docker/vagrantconfig.yaml
diff --git a/bigtop-deploy/vm/vagrant-puppet/.gitignore b/bigtop-deploy/vm/vagrant-puppet-vm/.gitignore
index 04204c7c..04204c7c 100644
--- a/bigtop-deploy/vm/vagrant-puppet/.gitignore
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/.gitignore
diff --git a/bigtop-deploy/vm/vagrant-puppet/README.md b/bigtop-deploy/vm/vagrant-puppet-vm/README.md
index e1e3d489..e1e3d489 100644
--- a/bigtop-deploy/vm/vagrant-puppet/README.md
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/README.md
diff --git a/bigtop-deploy/vm/vagrant-puppet/Vagrantfile b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
index 2f31055d..2f31055d 100755
--- a/bigtop-deploy/vm/vagrant-puppet/Vagrantfile
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/Vagrantfile
diff --git a/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml
index 7f79acc2..7f79acc2 100644
--- a/bigtop-deploy/vm/vagrant-puppet/vagrantconfig.yaml
+++ b/bigtop-deploy/vm/vagrant-puppet-vm/vagrantconfig.yaml