From 6f8631630b5f6eef26c9fa067f2423c7e9475086 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 28 Mar 2017 01:04:27 +0200 Subject: 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 -vars - common files are put under file - files specific to flavors are put under file/ 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 --- xci/file/aio/flavor-vars.yml | 0 xci/file/aio/inventory | 0 xci/file/aio/openstack_user_config.yml | 0 xci/file/aio/playbooks/configure-xcihost.yml | 0 xci/file/aio/playbooks/inventory | 2 -- xci/file/aio/var/ubuntu.yml | 7 ------- xci/file/cinder.yml | 0 xci/file/exports | 0 xci/file/ha/configure-targethosts.yml | 0 xci/file/ha/flavor-vars.yml | 0 xci/file/ha/inventory | 0 xci/file/ha/openstack_user_config.yml | 0 xci/file/ha/playbooks/configure-xcihost.yml | 0 xci/file/ha/playbooks/inventory | 0 xci/file/ha/var/ubuntu.yml | 0 xci/file/mini/configure-targethosts.yml | 0 xci/file/mini/flavor-vars.yml | 0 xci/file/mini/inventory | 0 xci/file/mini/openstack_user_config.yml | 0 xci/file/mini/playbooks/configure-xcihost.yml | 0 xci/file/mini/playbooks/inventory | 0 xci/file/mini/var/ubuntu.yml | 0 xci/file/modules | 0 xci/file/noha/configure-targethosts.yml | 0 xci/file/noha/flavor-vars.yml | 0 xci/file/noha/inventory | 0 xci/file/noha/openstack_user_config.yml | 0 xci/file/noha/playbooks/configure-xcihost.yml | 0 xci/file/noha/playbooks/inventory | 0 xci/file/noha/var/ubuntu.yml | 0 xci/file/setup-openstack.yml | 0 xci/file/user_variables.yml | 0 32 files changed, 9 deletions(-) create mode 100644 xci/file/aio/flavor-vars.yml create mode 100644 xci/file/aio/inventory create mode 100644 xci/file/aio/openstack_user_config.yml delete mode 100644 xci/file/aio/playbooks/configure-xcihost.yml delete mode 100644 xci/file/aio/playbooks/inventory delete mode 100644 xci/file/aio/var/ubuntu.yml create mode 100644 xci/file/cinder.yml create mode 100644 xci/file/exports delete mode 100644 xci/file/ha/configure-targethosts.yml create mode 100644 xci/file/ha/flavor-vars.yml create mode 100644 xci/file/ha/inventory create mode 100644 xci/file/ha/openstack_user_config.yml delete mode 100644 xci/file/ha/playbooks/configure-xcihost.yml delete mode 100644 xci/file/ha/playbooks/inventory delete mode 100644 xci/file/ha/var/ubuntu.yml delete mode 100644 xci/file/mini/configure-targethosts.yml create mode 100644 xci/file/mini/flavor-vars.yml create mode 100644 xci/file/mini/inventory create mode 100644 xci/file/mini/openstack_user_config.yml delete mode 100644 xci/file/mini/playbooks/configure-xcihost.yml delete mode 100644 xci/file/mini/playbooks/inventory delete mode 100644 xci/file/mini/var/ubuntu.yml create mode 100644 xci/file/modules delete mode 100644 xci/file/noha/configure-targethosts.yml create mode 100644 xci/file/noha/flavor-vars.yml create mode 100644 xci/file/noha/inventory create mode 100644 xci/file/noha/openstack_user_config.yml delete mode 100644 xci/file/noha/playbooks/configure-xcihost.yml delete mode 100644 xci/file/noha/playbooks/inventory delete mode 100644 xci/file/noha/var/ubuntu.yml create mode 100644 xci/file/setup-openstack.yml create mode 100644 xci/file/user_variables.yml (limited to 'xci/file') diff --git a/xci/file/aio/flavor-vars.yml b/xci/file/aio/flavor-vars.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/aio/inventory b/xci/file/aio/inventory new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/aio/openstack_user_config.yml b/xci/file/aio/openstack_user_config.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/aio/playbooks/configure-xcihost.yml b/xci/file/aio/playbooks/configure-xcihost.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/aio/playbooks/inventory b/xci/file/aio/playbooks/inventory deleted file mode 100644 index 9283e516..00000000 --- a/xci/file/aio/playbooks/inventory +++ /dev/null @@ -1,2 +0,0 @@ -[xciaio] -xciaio ansible_ssh_host=192.168.122.2 diff --git a/xci/file/aio/var/ubuntu.yml b/xci/file/aio/var/ubuntu.yml deleted file mode 100644 index 3a041b1c..00000000 --- a/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/xci/file/cinder.yml b/xci/file/cinder.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/exports b/xci/file/exports new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/ha/configure-targethosts.yml b/xci/file/ha/configure-targethosts.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/ha/flavor-vars.yml b/xci/file/ha/flavor-vars.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/ha/inventory b/xci/file/ha/inventory new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/ha/openstack_user_config.yml b/xci/file/ha/openstack_user_config.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/ha/playbooks/configure-xcihost.yml b/xci/file/ha/playbooks/configure-xcihost.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/ha/playbooks/inventory b/xci/file/ha/playbooks/inventory deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/ha/var/ubuntu.yml b/xci/file/ha/var/ubuntu.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/mini/configure-targethosts.yml b/xci/file/mini/configure-targethosts.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/mini/flavor-vars.yml b/xci/file/mini/flavor-vars.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/mini/inventory b/xci/file/mini/inventory new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/mini/openstack_user_config.yml b/xci/file/mini/openstack_user_config.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/mini/playbooks/configure-xcihost.yml b/xci/file/mini/playbooks/configure-xcihost.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/mini/playbooks/inventory b/xci/file/mini/playbooks/inventory deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/mini/var/ubuntu.yml b/xci/file/mini/var/ubuntu.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/modules b/xci/file/modules new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/noha/configure-targethosts.yml b/xci/file/noha/configure-targethosts.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/noha/flavor-vars.yml b/xci/file/noha/flavor-vars.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/noha/inventory b/xci/file/noha/inventory new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/noha/openstack_user_config.yml b/xci/file/noha/openstack_user_config.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/noha/playbooks/configure-xcihost.yml b/xci/file/noha/playbooks/configure-xcihost.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/noha/playbooks/inventory b/xci/file/noha/playbooks/inventory deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/noha/var/ubuntu.yml b/xci/file/noha/var/ubuntu.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/xci/file/setup-openstack.yml b/xci/file/setup-openstack.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/file/user_variables.yml b/xci/file/user_variables.yml new file mode 100644 index 00000000..e69de29b -- cgit 1.2.3-korg