xci: Yet another try to find how best to structure stuff

Summary of changes are
- flavors directory has been removed and the flavor config files are
moved into config and renamed to <flavor>-vars
- common files are put under file
- files specific to flavors are put under file/<flavor> directories
- templates and var files are stored in template and var directories
respectively
- 3 playbooks are created

Change-Id: I8a93e0947ccb02f93a6c8f00da27e0cc6b4dc21e
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/.gitignore b/.gitignore
index 0aa7b8c..431e521 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@ lib/
 lib64/
 parts/
 sdist/
-var/
 wheels/
 *.egg-info/
 .installed.cfg
@@ -35,3 +34,4 @@ nosetests.xml
 testapi_venv/
 .cache
 .tox
+*.retry

diff --git a/prototypes/xci/flavors/aio b/prototypes/xci/config/aio-vars
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from prototypes/xci/flavors/aio
rename to prototypes/xci/config/aio-vars

diff --git a/prototypes/xci/flavors/ha b/prototypes/xci/config/ha-vars
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from prototypes/xci/flavors/ha
rename to prototypes/xci/config/ha-vars

diff --git a/prototypes/xci/flavors/mini b/prototypes/xci/config/mini-vars
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from prototypes/xci/flavors/mini
rename to prototypes/xci/config/mini-vars

diff --git a/prototypes/xci/flavors/noha b/prototypes/xci/config/noha-vars
old mode 100644 (file)
new mode 100755 (executable)
similarity index 100%
rename from prototypes/xci/flavors/noha
rename to prototypes/xci/config/noha-vars

diff --git a/prototypes/xci/file/aio/playbooks/configure-xcihost.yml b/prototypes/xci/file/aio/flavor-vars.yml
similarity index 100%
rename from prototypes/xci/file/aio/playbooks/configure-xcihost.yml
rename to prototypes/xci/file/aio/flavor-vars.yml

diff --git a/prototypes/xci/file/ha/playbooks/inventory b/prototypes/xci/file/aio/inventory
similarity index 100%
rename from prototypes/xci/file/ha/playbooks/inventory
rename to prototypes/xci/file/aio/inventory

diff --git a/prototypes/xci/file/ha/configure-targethosts.yml b/prototypes/xci/file/aio/openstack_user_config.yml
similarity index 100%
rename from prototypes/xci/file/ha/configure-targethosts.yml
rename to prototypes/xci/file/aio/openstack_user_config.yml

diff --git a/prototypes/xci/file/aio/playbooks/inventory b/prototypes/xci/file/aio/playbooks/inventory
deleted file mode 100644 (file)
index 9283e51..0000000
--- a/prototypes/xci/file/aio/playbooks/inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-[xciaio]
-xciaio ansible_ssh_host=192.168.122.2

diff --git a/prototypes/xci/file/aio/var/ubuntu.yml b/prototypes/xci/file/aio/var/ubuntu.yml
deleted file mode 100644 (file)
index 3a041b1..0000000
--- a/prototypes/xci/file/aio/var/ubuntu.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-OPENSTACK_OSA_GIT_URL: "{{ lookup('env','OPENSTACK_OSA_GIT_URL') }}"
-OPENSTACK_OSA_PATH: "{{ lookup('env','OPENSTACK_OSA_PATH') }}"
-OPENSTACK_OSA_VERSION: "{{ lookup('env','OPENSTACK_OSA_VERSION') }}"
-OPENSTACK_OSA_ETC_PATH: "{{ lookup('env','OPENSTACK_OSA_ETC_PATH') }}"
-XCI_IP: "{{ lookup('env','XCI_IP') }}"
-multi_host: "False"

diff --git a/prototypes/xci/file/ha/playbooks/configure-xcihost.yml b/prototypes/xci/file/cinder.yml
similarity index 100%
rename from prototypes/xci/file/ha/playbooks/configure-xcihost.yml
rename to prototypes/xci/file/cinder.yml

diff --git a/prototypes/xci/file/ha/var/ubuntu.yml b/prototypes/xci/file/exports
similarity index 100%
rename from prototypes/xci/file/ha/var/ubuntu.yml
rename to prototypes/xci/file/exports

diff --git a/prototypes/xci/file/mini/configure-targethosts.yml b/prototypes/xci/file/ha/flavor-vars.yml
similarity index 100%
rename from prototypes/xci/file/mini/configure-targethosts.yml
rename to prototypes/xci/file/ha/flavor-vars.yml

diff --git a/prototypes/xci/file/mini/playbooks/inventory b/prototypes/xci/file/ha/inventory
similarity index 100%
rename from prototypes/xci/file/mini/playbooks/inventory
rename to prototypes/xci/file/ha/inventory

diff --git a/prototypes/xci/file/mini/playbooks/configure-xcihost.yml b/prototypes/xci/file/ha/openstack_user_config.yml
similarity index 100%
rename from prototypes/xci/file/mini/playbooks/configure-xcihost.yml
rename to prototypes/xci/file/ha/openstack_user_config.yml

diff --git a/prototypes/xci/file/mini/var/ubuntu.yml b/prototypes/xci/file/mini/flavor-vars.yml
similarity index 100%
rename from prototypes/xci/file/mini/var/ubuntu.yml
rename to prototypes/xci/file/mini/flavor-vars.yml

diff --git a/prototypes/xci/file/noha/playbooks/inventory b/prototypes/xci/file/mini/inventory
similarity index 100%
rename from prototypes/xci/file/noha/playbooks/inventory
rename to prototypes/xci/file/mini/inventory

diff --git a/prototypes/xci/file/noha/configure-targethosts.yml b/prototypes/xci/file/mini/openstack_user_config.yml
similarity index 100%
rename from prototypes/xci/file/noha/configure-targethosts.yml
rename to prototypes/xci/file/mini/openstack_user_config.yml

diff --git a/prototypes/xci/file/noha/playbooks/configure-xcihost.yml b/prototypes/xci/file/modules
similarity index 100%
rename from prototypes/xci/file/noha/playbooks/configure-xcihost.yml
rename to prototypes/xci/file/modules

diff --git a/prototypes/xci/file/noha/var/ubuntu.yml b/prototypes/xci/file/noha/flavor-vars.yml
similarity index 100%
rename from prototypes/xci/file/noha/var/ubuntu.yml
rename to prototypes/xci/file/noha/flavor-vars.yml

diff --git a/prototypes/xci/file/noha/inventory b/prototypes/xci/file/noha/inventory
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/file/noha/openstack_user_config.yml b/prototypes/xci/file/noha/openstack_user_config.yml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/file/setup-openstack.yml b/prototypes/xci/file/setup-openstack.yml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/file/user_variables.yml b/prototypes/xci/file/user_variables.yml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/playbooks/configure-localhost.yml b/prototypes/xci/playbooks/configure-localhost.yml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/playbooks/inventory b/prototypes/xci/playbooks/inventory
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/template/compute.interface.j2 b/prototypes/xci/template/compute.interface.j2
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/template/controller.interface.j2 b/prototypes/xci/template/controller.interface.j2
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/template/xci.interface.j2 b/prototypes/xci/template/xci.interface.j2
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/var/ubuntu.yml b/prototypes/xci/var/ubuntu.yml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prototypes/xci/xci-deploy.sh b/prototypes/xci/xci-deploy.sh
index 401c098..eb1e9d7 100755 (executable)
--- a/prototypes/xci/xci-deploy.sh
+++ b/prototypes/xci/xci-deploy.sh
@@ -20,7 +20,7 @@ source $XCI_PATH/config/pinned-versions
 source $XCI_PATH/config/user-vars
 
 # source flavor configuration
-source $XCI_PATH/flavors/$XCI_FLAVOR
+source "$XCI_PATH/flavors/${XCI_FLAVOR}-vars"
 
 # source xci configuration
 source $XCI_PATH/config/env-vars