Merge "Move around the development environments"

2015-10-08 08:02:04 +00:00 · 2015-10-08 08:02:04 +00:00 · eb6a367464
commit eb6a367464
parent 7fc632794b 3b92e8714f
7 changed files with 3 additions and 3 deletions
--- a/README.rst
+++ b/README.rst
@ -66,7 +66,9 @@ Directories
 -  ansible - Contains Anible playbooks to deploy Kolla in Docker
   containers.
 -  demos - Contains a few demos to use with Kolla.
-  devenv - Contains an OpenStack-Heat based development environment.
+-  dev/heat - Contains an OpenStack-Heat based development environment.
 -  dev/vagrant - Contains a vagrant VirtualBox/Libvirt based development
   environment.
 -  doc - Contains documentation.
 -  etc - Contains a reference etc directory structure which requires
   configuration of a small number of configuration variables to achieve
@ -76,8 +78,6 @@ Directories
 -  specs - Contains the Kolla communities key arguments about
   architectural shifts in the code base.
 -  tests - Contains functional testing tools.
 -  vagrant - Contains a vagrant VirtualBox-based development
   environment.
 Getting Involved
 ================
--- a/dev/heat/get-image.sh
+++ b/dev/heat/get-image.sh
--- a/dev/heat/kollacluster.yaml
+++ b/dev/heat/kollacluster.yaml
--- a/dev/heat/kollanode.yaml
+++ b/dev/heat/kollanode.yaml
--- a/dev/heat/local.yaml.example
+++ b/dev/heat/local.yaml.example
--- a/dev/vagrant/Vagrantfile
+++ b/dev/vagrant/Vagrantfile
--- a/dev/vagrant/bootstrap.sh
+++ b/dev/vagrant/bootstrap.sh