aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.rst6
-rwxr-xr-xdev/heat/get-image.sh (renamed from devenv/get-image.sh)0
-rw-r--r--dev/heat/kollacluster.yaml (renamed from devenv/kollacluster.yaml)0
-rw-r--r--dev/heat/kollanode.yaml (renamed from devenv/kollanode.yaml)0
-rw-r--r--dev/heat/local.yaml.example (renamed from devenv/local.yaml.example)0
-rw-r--r--dev/vagrant/Vagrantfile (renamed from vagrant/Vagrantfile)0
-rw-r--r--dev/vagrant/bootstrap.sh (renamed from vagrant/bootstrap.sh)0
7 files changed, 3 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index 5904a24e7..2e581c0a2 100644
--- a/README.rst
+++ b/README.rst
@@ -70,7 +70,9 @@ Directories
community members which want to use Kolla container content without
Ansible.
- 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
@@ -80,8 +82,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
================
diff --git a/devenv/get-image.sh b/dev/heat/get-image.sh
index 21166301e..21166301e 100755
--- a/devenv/get-image.sh
+++ b/dev/heat/get-image.sh
diff --git a/devenv/kollacluster.yaml b/dev/heat/kollacluster.yaml
index bfc7554cd..bfc7554cd 100644
--- a/devenv/kollacluster.yaml
+++ b/dev/heat/kollacluster.yaml
diff --git a/devenv/kollanode.yaml b/dev/heat/kollanode.yaml
index ce809e4ed..ce809e4ed 100644
--- a/devenv/kollanode.yaml
+++ b/dev/heat/kollanode.yaml
diff --git a/devenv/local.yaml.example b/dev/heat/local.yaml.example
index 8f76cd835..8f76cd835 100644
--- a/devenv/local.yaml.example
+++ b/dev/heat/local.yaml.example
diff --git a/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile
index c2c1d7f68..c2c1d7f68 100644
--- a/vagrant/Vagrantfile
+++ b/dev/vagrant/Vagrantfile
diff --git a/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index 889942922..889942922 100644
--- a/vagrant/bootstrap.sh
+++ b/dev/vagrant/bootstrap.sh