diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-10-14 09:57:57 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-10-14 10:09:18 +0200 |
| commit | 959158ab0457afc4454e637db89f9d16f8aad775 (patch) | |
| tree | 44870c605e38bfd4026c8a14fdf47c12a8ef420d /config | |
| parent | 2fc91b1dc56823bc615ce0cb19a8ee79645af6a2 (diff) | |
controller: configuration cleanup
Better define configuration and provide examples.
* controller: Unpack results to correct directory, load the
configuration from new place, call run_remote with proper
arguments, generate 'results.html' with result_stats script.
* ansible/run_include: Adjust to better simulate run_remote.
* ansible/fedora.yml: Adjust for fixed configuration.
* run_remote: Likewise. Also small issues with option parsing
fixed.
* config.sh.template: Moved as config/config.sh.template.
* config/config.sh.template: Copyyed from /config.sh.template,
better documented options.
* run: Fix typo - use 'while read i' instead of 'for i in'.
* config/os/EXAMPLE.sh: New file - exmaple configuration.
* private/os/EXAMPLE.yml: Likewise.
* config/hosts.template: Likewise.
* dist.include: New file with file patterns that should be
distributed to test machine.
* dist: Distribute only those files which are necessary.
* config/.gitignore: New gitignore file.
Diffstat (limited to 'config')
| -rw-r--r-- | config/.gitignore | 2 | ||||
| -rw-r--r-- | config/config.sh.template | 24 | ||||
| -rw-r--r-- | config/hosts.template | 2 | ||||
| -rw-r--r-- | config/os/EXAMPLE.sh | 15 |
4 files changed, 43 insertions, 0 deletions
diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 0000000..57c4fcb --- /dev/null +++ b/config/.gitignore @@ -0,0 +1,2 @@ +*.sh +hosts diff --git a/config/config.sh.template b/config/config.sh.template new file mode 100644 index 0000000..b2b2fa5 --- /dev/null +++ b/config/config.sh.template @@ -0,0 +1,24 @@ +# OpenStack ID +# ------------ +# +# This sets up which instance of OS are the tests run against by default. +# Based on the OS ID (for example 'EXAMPLE'), those configuration-like files are +# searched and read: +# +# * private/os/example.yml +# File having OpenStack credentials in ansible variable file (YAML file +# with "key: value" lines). See the ./private/os/EXAMPLE.yml for +# variables you should set up. +# +# * config/os/EXAMPLE.sh +# This file must contain basic OpenStack specific information about VM +# setup on particular OS instance. + +export DTF_OPENSTACK_ID=dropbear + +# Result Database +# --------------- +# Directory where the testsuite should keep its (persistent) results. Make sure +# that this directory is backed up. + +export DTF_DATABASE=/var/lib/dtf_results diff --git a/config/hosts.template b/config/hosts.template new file mode 100644 index 0000000..6850700 --- /dev/null +++ b/config/hosts.template @@ -0,0 +1,2 @@ +[host] +10.64.27.30 diff --git a/config/os/EXAMPLE.sh b/config/os/EXAMPLE.sh new file mode 100644 index 0000000..47e1d41 --- /dev/null +++ b/config/os/EXAMPLE.sh @@ -0,0 +1,15 @@ +## THIS IS EXAMPLE OPENSTACK DTF CONFIGURATION ## + +declare -A os_flavor_ids os_image_ids +export os_flavor_ids=[] +export os_image_ids=[] + +# connection info about particular OpenStack instance +export os_keypair="keypair-id" +export os_security_group=default_id +export os_network_dev=default_id + +# list of distro-specific images/flavors +os_flavor_ids["fedora20"]="2" +os_image_ids["fedora20"]="0461eef2-5921-4c01-95a6-6edf96d41b89" + |