diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-08 08:02:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-08 08:02:04 +0000 |
| commit | eb6a367464d65a6e554d169c9f5f77f50b4cff7c (patch) | |
| tree | 82aea8770c52b36dc29fb084c012f0df951f5ca4 | |
| parent | 7fc632794b65a37e47508bf1eecf6d2e6c46c6fc (diff) | |
| parent | 3b92e8714fc9a2e10cdbd73e36c05c838ba55852 (diff) | |
| download | kolla-eb6a367464d65a6e554d169c9f5f77f50b4cff7c.tar.gz kolla-eb6a367464d65a6e554d169c9f5f77f50b4cff7c.zip | |
Merge "Move around the development environments"
| -rw-r--r-- | README.rst | 6 | ||||
| -rwxr-xr-x | dev/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 0bbdd05cb..0c82f2518 100644 --- 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 ================ 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 |