Move demos and dev directory into a new contrib directory

TrivialFix

Change-Id: Ifb8f19afa1514488bd288670d08b96f84982a4e1

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.
+-  ``contrib`` - Contains demos scenarios for Heat and Murano and a development
--  ``dev/vagrant`` - Contains a vagrant VirtualBox/Libvirt based development
+   environment for Vagrant
-   environment.
 -  ``doc`` - Contains documentation.
 -  ``docker`` - Contains jinja2 templates for the docker build system.
 -  ``etc`` - Contains a reference etc directory structure which requires

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.

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))