From c580e947a59bc00996c6057c363f13e0398682a6 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
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 <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>
---
prototypes/xci/file/aio/flavor-vars.yml | 0
prototypes/xci/file/aio/inventory | 0
prototypes/xci/file/aio/openstack_user_config.yml | 0
prototypes/xci/file/aio/playbooks/configure-xcihost.yml | 0
prototypes/xci/file/aio/playbooks/inventory | 2 --
prototypes/xci/file/aio/var/ubuntu.yml | 7 -------
6 files changed, 9 deletions(-)
create mode 100644 prototypes/xci/file/aio/flavor-vars.yml
create mode 100644 prototypes/xci/file/aio/inventory
create mode 100644 prototypes/xci/file/aio/openstack_user_config.yml
delete mode 100644 prototypes/xci/file/aio/playbooks/configure-xcihost.yml
delete mode 100644 prototypes/xci/file/aio/playbooks/inventory
delete mode 100644 prototypes/xci/file/aio/var/ubuntu.yml
(limited to 'prototypes/xci/file/aio')
diff --git a/prototypes/xci/file/aio/flavor-vars.yml b/prototypes/xci/file/aio/flavor-vars.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/prototypes/xci/file/aio/inventory b/prototypes/xci/file/aio/inventory
new file mode 100644
index 000000000..e69de29bb
diff --git a/prototypes/xci/file/aio/openstack_user_config.yml b/prototypes/xci/file/aio/openstack_user_config.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/prototypes/xci/file/aio/playbooks/configure-xcihost.yml b/prototypes/xci/file/aio/playbooks/configure-xcihost.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/prototypes/xci/file/aio/playbooks/inventory b/prototypes/xci/file/aio/playbooks/inventory
deleted file mode 100644
index 9283e516d..000000000
--- 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
index 3a041b1cb..000000000
--- 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"
--
cgit