Move demos and dev directory into a new contrib directory

TrivialFix

Change-Id: Ifb8f19afa1514488bd288670d08b96f84982a4e1

20 files changed, 5 insertions, 6 deletions

diff --git a/README.rst b/README.rst
index d349d45d1..acd9c9573 100644
--- a/README.rst
+++ b/README.rst
@@ -111,9 +111,8 @@ Directories
 
 -  ``ansible`` - Contains Ansible playbooks to deploy Kolla in Docker
    containers.
--  ``demos`` - Contains a few demos to use with Kolla.
--  ``dev/vagrant`` - Contains a vagrant VirtualBox/Libvirt based development
-   environment.
+-  ``contrib`` - Contains demos scenarios for Heat and Murano and a development
+   environment for Vagrant
 -  ``doc`` - Contains documentation.
 -  ``docker`` - Contains jinja2 templates for the docker build system.
 -  ``etc`` - Contains a reference etc directory structure which requires
diff --git a/demos/heat/README.rst b/contrib/demos/heat/README.rst
index b634febd8..b634febd8 100644
--- a/demos/heat/README.rst
+++ b/contrib/demos/heat/README.rst
diff --git a/demos/heat/launch b/contrib/demos/heat/launch
index 768b69eb0..768b69eb0 100755
--- a/demos/heat/launch
+++ b/contrib/demos/heat/launch
diff --git a/demos/heat/steak-rg.yaml b/contrib/demos/heat/steak-rg.yaml
index 4c0a1db93..4c0a1db93 100644
--- a/demos/heat/steak-rg.yaml
+++ b/contrib/demos/heat/steak-rg.yaml
diff --git a/demos/heat/steak.yaml b/contrib/demos/heat/steak.yaml
index 9b9bd9fc7..9b9bd9fc7 100644
--- a/demos/heat/steak.yaml
+++ b/contrib/demos/heat/steak.yaml
diff --git a/demos/magnum/redis b/contrib/demos/magnum/redis
index cf8c61463..cf8c61463 100755
--- a/demos/magnum/redis
+++ b/contrib/demos/magnum/redis
diff --git a/demos/magnum/redis-kube/README.rst b/contrib/demos/magnum/redis-kube/README.rst
index 0a0ede6ab..0a0ede6ab 100644
--- a/demos/magnum/redis-kube/README.rst
+++ b/contrib/demos/magnum/redis-kube/README.rst
diff --git a/demos/magnum/redis-kube/redis-controller.yaml b/contrib/demos/magnum/redis-kube/redis-controller.yaml
index 4eaf61eae..4eaf61eae 100644
--- a/demos/magnum/redis-kube/redis-controller.yaml
+++ b/contrib/demos/magnum/redis-kube/redis-controller.yaml
diff --git a/demos/magnum/redis-kube/redis-master.yaml b/contrib/demos/magnum/redis-kube/redis-master.yaml
index 02abada97..02abada97 100644
--- a/demos/magnum/redis-kube/redis-master.yaml
+++ b/contrib/demos/magnum/redis-kube/redis-master.yaml
diff --git a/demos/magnum/redis-kube/redis-proxy.yaml b/contrib/demos/magnum/redis-kube/redis-proxy.yaml
index 2993a45bf..2993a45bf 100644
--- a/demos/magnum/redis-kube/redis-proxy.yaml
+++ b/contrib/demos/magnum/redis-kube/redis-proxy.yaml
diff --git a/demos/magnum/redis-kube/redis-sentinel-controller.yaml b/contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml
index 157b09e8a..157b09e8a 100644
--- a/demos/magnum/redis-kube/redis-sentinel-controller.yaml
+++ b/contrib/demos/magnum/redis-kube/redis-sentinel-controller.yaml
diff --git a/demos/magnum/redis-kube/redis-sentinel-service.yaml b/contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml
index 7078d182f..7078d182f 100644
--- a/demos/magnum/redis-kube/redis-sentinel-service.yaml
+++ b/contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml
diff --git a/demos/magnum/start b/contrib/demos/magnum/start
index 3a3cd29a6..3a3cd29a6 100755
--- a/demos/magnum/start
+++ b/contrib/demos/magnum/start
diff --git a/demos/magnum/stop b/contrib/demos/magnum/stop
index 67da543e0..67da543e0 100755
--- a/demos/magnum/stop
+++ b/contrib/demos/magnum/stop
diff --git a/dev/vagrant/Vagrantfile b/contrib/dev/vagrant/Vagrantfile
index f59fafaec..f59fafaec 100644
--- a/dev/vagrant/Vagrantfile
+++ b/contrib/dev/vagrant/Vagrantfile
diff --git a/dev/vagrant/Vagrantfile.custom.example b/contrib/dev/vagrant/Vagrantfile.custom.example
index 09af72f5b..09af72f5b 100644
--- a/dev/vagrant/Vagrantfile.custom.example
+++ b/contrib/dev/vagrant/Vagrantfile.custom.example
diff --git a/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh
index ec89440b8..ec89440b8 100644
--- a/dev/vagrant/bootstrap.sh
+++ b/contrib/dev/vagrant/bootstrap.sh
diff --git a/dev/vagrant/newest_dhcp_lease.py b/contrib/dev/vagrant/newest_dhcp_lease.py
index bb229af1d..bb229af1d 100644
--- a/dev/vagrant/newest_dhcp_lease.py
+++ b/contrib/dev/vagrant/newest_dhcp_lease.py
diff --git a/doc/vagrant-dev-env.rst b/doc/vagrant-dev-env.rst
index 416cbf7ee..8ed3d3e4c 100644
--- a/doc/vagrant-dev-env.rst
+++ b/doc/vagrant-dev-env.rst
@@ -94,7 +94,7 @@ Find a location in the system's home directory and checkout the Kolla repo::
 Developers can now tweak the Vagrantfile or bring up the default **all-in-one**
 CentOS 7-based environment::
 
-    cd kolla/dev/vagrant && vagrant up
+    cd kolla/contrib/dev/vagrant && vagrant up
 
 The command ``vagrant status`` provides a quick overview of the VMs composing
 the environment.
diff --git a/tools/loc b/tools/loc
index d2885b78c..60b14e24f 100755
--- a/tools/loc
+++ b/tools/loc
@@ -6,11 +6,11 @@ DOC=`find doc -type f -exec cat {} \; | wc -l`
 TESTS=`find tests -type f -exec cat {} \; | wc -l`
 BUILD=`find kolla -type f -exec cat {} \; | wc -l`
 
-DEMOS=`find demos -type f -exec cat {} \; | wc -l`
+DEMOS=`find contrib/demos -type f -exec cat {} \; | wc -l`
 SPECS=`find specs -type f -exec cat {} \; | wc -l`
 ETC=`find etc -type f -exec cat {} \; | wc -l`
 TOOLS=`find tools -type f -exec cat {} \; | wc -l`
-VAGRANT=`find dev/vagrant -type f -exec cat {} \; | wc -l`
+VAGRANT=`find contrib/dev/vagrant -type f -exec cat {} \; | wc -l`
 
 CORE=$(($ANSIBLE+$DOCKER+$TESTS+$DOCS+$BUILD))
 SUPP=$(($DEMOS+$HEAT+$SPECS+$ETC+$TOOLS+$VAGRANT))