From 6f8631630b5f6eef26c9fa067f2423c7e9475086 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 28 Mar 2017 01:04:27 +0200 Subject: [PATCH] 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/{flavors/aio => config/aio-vars} | 0 xci/{flavors/ha => config/ha-vars} | 0 xci/{flavors/mini => config/mini-vars} | 0 xci/{flavors/noha => config/noha-vars} | 0 xci/file/aio/{playbooks/configure-xcihost.yml => flavor-vars.yml} | 0 xci/file/{ha/playbooks => aio}/inventory | 0 .../configure-targethosts.yml => aio/openstack_user_config.yml} | 0 xci/file/aio/playbooks/inventory | 2 -- xci/file/aio/var/ubuntu.yml | 7 ------- xci/file/{ha/playbooks/configure-xcihost.yml => cinder.yml} | 0 xci/file/{ha/var/ubuntu.yml => exports} | 0 xci/file/{mini/configure-targethosts.yml => ha/flavor-vars.yml} | 0 xci/file/{mini/playbooks => ha}/inventory | 0 .../configure-xcihost.yml => ha/openstack_user_config.yml} | 0 xci/file/mini/{var/ubuntu.yml => flavor-vars.yml} | 0 xci/file/{noha/playbooks => mini}/inventory | 0 .../configure-targethosts.yml => mini/openstack_user_config.yml} | 0 xci/file/{noha/playbooks/configure-xcihost.yml => modules} | 0 xci/file/noha/{var/ubuntu.yml => flavor-vars.yml} | 0 xci/file/noha/inventory | 0 xci/file/noha/openstack_user_config.yml | 0 xci/file/setup-openstack.yml | 0 xci/file/user_variables.yml | 0 xci/playbooks/configure-localhost.yml | 0 xci/playbooks/inventory | 0 xci/template/compute.interface.j2 | 0 xci/template/controller.interface.j2 | 0 xci/template/xci.interface.j2 | 0 xci/var/ubuntu.yml | 0 xci/xci-deploy.sh | 2 +- 30 files changed, 1 insertion(+), 10 deletions(-) rename xci/{flavors/aio => config/aio-vars} (100%) mode change 100644 => 100755 rename xci/{flavors/ha => config/ha-vars} (100%) mode change 100644 => 100755 rename xci/{flavors/mini => config/mini-vars} (100%) mode change 100644 => 100755 rename xci/{flavors/noha => config/noha-vars} (100%) mode change 100644 => 100755 rename xci/file/aio/{playbooks/configure-xcihost.yml => flavor-vars.yml} (100%) rename xci/file/{ha/playbooks => aio}/inventory (100%) rename xci/file/{ha/configure-targethosts.yml => aio/openstack_user_config.yml} (100%) delete mode 100644 xci/file/aio/playbooks/inventory delete mode 100644 xci/file/aio/var/ubuntu.yml rename xci/file/{ha/playbooks/configure-xcihost.yml => cinder.yml} (100%) rename xci/file/{ha/var/ubuntu.yml => exports} (100%) rename xci/file/{mini/configure-targethosts.yml => ha/flavor-vars.yml} (100%) rename xci/file/{mini/playbooks => ha}/inventory (100%) rename xci/file/{mini/playbooks/configure-xcihost.yml => ha/openstack_user_config.yml} (100%) rename xci/file/mini/{var/ubuntu.yml => flavor-vars.yml} (100%) rename xci/file/{noha/playbooks => mini}/inventory (100%) rename xci/file/{noha/configure-targethosts.yml => mini/openstack_user_config.yml} (100%) rename xci/file/{noha/playbooks/configure-xcihost.yml => modules} (100%) rename xci/file/noha/{var/ubuntu.yml => flavor-vars.yml} (100%) create mode 100644 xci/file/noha/inventory create mode 100644 xci/file/noha/openstack_user_config.yml create mode 100644 xci/file/setup-openstack.yml create mode 100644 xci/file/user_variables.yml create mode 100644 xci/playbooks/configure-localhost.yml create mode 100644 xci/playbooks/inventory create mode 100644 xci/template/compute.interface.j2 create mode 100644 xci/template/controller.interface.j2 create mode 100644 xci/template/xci.interface.j2 create mode 100644 xci/var/ubuntu.yml diff --git a/xci/flavors/aio b/xci/config/aio-vars old mode 100644 new mode 100755 similarity index 100% rename from xci/flavors/aio rename to xci/config/aio-vars diff --git a/xci/flavors/ha b/xci/config/ha-vars old mode 100644 new mode 100755 similarity index 100% rename from xci/flavors/ha rename to xci/config/ha-vars diff --git a/xci/flavors/mini b/xci/config/mini-vars old mode 100644 new mode 100755 similarity index 100% rename from xci/flavors/mini rename to xci/config/mini-vars diff --git a/xci/flavors/noha b/xci/config/noha-vars old mode 100644 new mode 100755 similarity index 100% rename from xci/flavors/noha rename to xci/config/noha-vars diff --git a/xci/file/aio/playbooks/configure-xcihost.yml b/xci/file/aio/flavor-vars.yml similarity index 100% rename from xci/file/aio/playbooks/configure-xcihost.yml rename to xci/file/aio/flavor-vars.yml diff --git a/xci/file/ha/playbooks/inventory b/xci/file/aio/inventory similarity index 100% rename from xci/file/ha/playbooks/inventory rename to xci/file/aio/inventory diff --git a/xci/file/ha/configure-targethosts.yml b/xci/file/aio/openstack_user_config.yml similarity index 100% rename from xci/file/ha/configure-targethosts.yml rename to xci/file/aio/openstack_user_config.yml 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/ha/playbooks/configure-xcihost.yml b/xci/file/cinder.yml similarity index 100% rename from xci/file/ha/playbooks/configure-xcihost.yml rename to xci/file/cinder.yml diff --git a/xci/file/ha/var/ubuntu.yml b/xci/file/exports similarity index 100% rename from xci/file/ha/var/ubuntu.yml rename to xci/file/exports diff --git a/xci/file/mini/configure-targethosts.yml b/xci/file/ha/flavor-vars.yml similarity index 100% rename from xci/file/mini/configure-targethosts.yml rename to xci/file/ha/flavor-vars.yml diff --git a/xci/file/mini/playbooks/inventory b/xci/file/ha/inventory similarity index 100% rename from xci/file/mini/playbooks/inventory rename to xci/file/ha/inventory diff --git a/xci/file/mini/playbooks/configure-xcihost.yml b/xci/file/ha/openstack_user_config.yml similarity index 100% rename from xci/file/mini/playbooks/configure-xcihost.yml rename to xci/file/ha/openstack_user_config.yml diff --git a/xci/file/mini/var/ubuntu.yml b/xci/file/mini/flavor-vars.yml similarity index 100% rename from xci/file/mini/var/ubuntu.yml rename to xci/file/mini/flavor-vars.yml diff --git a/xci/file/noha/playbooks/inventory b/xci/file/mini/inventory similarity index 100% rename from xci/file/noha/playbooks/inventory rename to xci/file/mini/inventory diff --git a/xci/file/noha/configure-targethosts.yml b/xci/file/mini/openstack_user_config.yml similarity index 100% rename from xci/file/noha/configure-targethosts.yml rename to xci/file/mini/openstack_user_config.yml diff --git a/xci/file/noha/playbooks/configure-xcihost.yml b/xci/file/modules similarity index 100% rename from xci/file/noha/playbooks/configure-xcihost.yml rename to xci/file/modules diff --git a/xci/file/noha/var/ubuntu.yml b/xci/file/noha/flavor-vars.yml similarity index 100% rename from xci/file/noha/var/ubuntu.yml rename to xci/file/noha/flavor-vars.yml 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/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 diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/playbooks/inventory b/xci/playbooks/inventory new file mode 100644 index 00000000..e69de29b diff --git a/xci/template/compute.interface.j2 b/xci/template/compute.interface.j2 new file mode 100644 index 00000000..e69de29b diff --git a/xci/template/controller.interface.j2 b/xci/template/controller.interface.j2 new file mode 100644 index 00000000..e69de29b diff --git a/xci/template/xci.interface.j2 b/xci/template/xci.interface.j2 new file mode 100644 index 00000000..e69de29b diff --git a/xci/var/ubuntu.yml b/xci/var/ubuntu.yml new file mode 100644 index 00000000..e69de29b diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 401c098c..eb1e9d78 100755 --- a/xci/xci-deploy.sh +++ b/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 -- 2.16.6