Merge "Move around the development environments"

eb6a3674 · Jenkins · Gerrit Code Review · 7fc63279 · 3b92e871 · eb6a3674
Commit eb6a3674 authored 9 years ago by Jenkins Committed by Gerrit Code Review 9 years ago
--- 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/devenv/get-image.sh
+++ b/devenv/get-image.sh
--- a/devenv/kollacluster.yaml
+++ b/devenv/kollacluster.yaml
--- a/devenv/kollanode.yaml
+++ b/devenv/kollanode.yaml
--- a/devenv/local.yaml.example
+++ b/devenv/local.yaml.example
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh