diff --git a/README.rst b/README.rst index d349d45d12..acd9c9573d 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 similarity index 100% rename from demos/heat/README.rst rename to contrib/demos/heat/README.rst diff --git a/demos/heat/launch b/contrib/demos/heat/launch similarity index 100% rename from demos/heat/launch rename to contrib/demos/heat/launch diff --git a/demos/heat/steak-rg.yaml b/contrib/demos/heat/steak-rg.yaml similarity index 100% rename from demos/heat/steak-rg.yaml rename to contrib/demos/heat/steak-rg.yaml diff --git a/demos/heat/steak.yaml b/contrib/demos/heat/steak.yaml similarity index 100% rename from demos/heat/steak.yaml rename to contrib/demos/heat/steak.yaml diff --git a/demos/magnum/redis b/contrib/demos/magnum/redis similarity index 100% rename from demos/magnum/redis rename to contrib/demos/magnum/redis diff --git a/demos/magnum/redis-kube/README.rst b/contrib/demos/magnum/redis-kube/README.rst similarity index 100% rename from demos/magnum/redis-kube/README.rst rename to 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 similarity index 100% rename from demos/magnum/redis-kube/redis-controller.yaml rename to 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 similarity index 100% rename from demos/magnum/redis-kube/redis-master.yaml rename to 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 similarity index 100% rename from demos/magnum/redis-kube/redis-proxy.yaml rename to 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 similarity index 100% rename from demos/magnum/redis-kube/redis-sentinel-controller.yaml rename to 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 similarity index 100% rename from demos/magnum/redis-kube/redis-sentinel-service.yaml rename to contrib/demos/magnum/redis-kube/redis-sentinel-service.yaml diff --git a/demos/magnum/start b/contrib/demos/magnum/start similarity index 100% rename from demos/magnum/start rename to contrib/demos/magnum/start diff --git a/demos/magnum/stop b/contrib/demos/magnum/stop similarity index 100% rename from demos/magnum/stop rename to contrib/demos/magnum/stop diff --git a/dev/vagrant/Vagrantfile b/contrib/dev/vagrant/Vagrantfile similarity index 100% rename from dev/vagrant/Vagrantfile rename to contrib/dev/vagrant/Vagrantfile diff --git a/dev/vagrant/Vagrantfile.custom.example b/contrib/dev/vagrant/Vagrantfile.custom.example similarity index 100% rename from dev/vagrant/Vagrantfile.custom.example rename to contrib/dev/vagrant/Vagrantfile.custom.example diff --git a/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh similarity index 100% rename from dev/vagrant/bootstrap.sh rename to contrib/dev/vagrant/bootstrap.sh diff --git a/dev/vagrant/newest_dhcp_lease.py b/contrib/dev/vagrant/newest_dhcp_lease.py similarity index 100% rename from dev/vagrant/newest_dhcp_lease.py rename to contrib/dev/vagrant/newest_dhcp_lease.py diff --git a/doc/vagrant-dev-env.rst b/doc/vagrant-dev-env.rst index 416cbf7ee1..8ed3d3e4c9 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 d2885b78c8..60b14e24fd 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))