diff options
| -rw-r--r-- | config/config.sh.template | 26 | ||||
| -rw-r--r-- | config/os/EXAMPLE.sh | 11 |
2 files changed, 23 insertions, 14 deletions
diff --git a/config/config.sh.template b/config/config.sh.template index 3aa9add..94cbe22 100644 --- a/config/config.sh.template +++ b/config/config.sh.template @@ -1,18 +1,21 @@ # 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: +# By default, based on DTF_OPENSTACK_ID content the corresponding OpenStack +# configuration is used. You may have multiple OpenStack instances configured - +# this option selects one. Based on the OpenStack ID (say 'EXAMPLE'), those +# configuration-like files are used: # -# * private/os/example.yml +# * 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. +# variables you should set up. Keep this file secret. # -# * config/os/EXAMPLE.sh -# This file must contain basic OpenStack specific information about VM -# setup on particular OS instance. +# * config/os/'EXAMPLE'.sh +# This file must contain configuration for specific OpenStack instance. +# Usually information about available images, flavors, networking, etc. +# The template file config/os/EXAMPLE.sh may be used when configuring your +# testing environment. export DTF_OPENSTACK_ID=dropbear @@ -25,8 +28,9 @@ export DTF_DATABASE=/var/lib/dtf_results # Presenter place # --------------- -# For now, only static results are available. DTF_PRESENTER_PLACE contains -# rsync-compatible destination (it may be place accessible via ssh). That place -# should be available via apache but thats up to you. +# For now, only static results are available. DTF_PRESENTER_PLACE must contain +# rsync-compatible destination (it may be place accessible via ssh+rsync). It +# is expected that some httpd server is able to read the directory with results +# and publish them as static directory structure over http://. export DTF_PRESENTER_PLACE=user@example.org:/var/www/html/my_project/dtf diff --git a/config/os/EXAMPLE.sh b/config/os/EXAMPLE.sh index 47e1d41..b5ba270 100644 --- a/config/os/EXAMPLE.sh +++ b/config/os/EXAMPLE.sh @@ -1,15 +1,20 @@ ## THIS IS EXAMPLE OPENSTACK DTF CONFIGURATION ## +# variable declarations, should be C&Ped declare -A os_flavor_ids os_image_ids export os_flavor_ids=[] export os_image_ids=[] # connection info about particular OpenStack instance + +# which ssh keys should be uploaded to created VMs export os_keypair="keypair-id" -export os_security_group=default_id -export os_network_dev=default_id +# group of firewall rules to be set on VMs +export os_security_group=test_group +# the name of network connection as is presented by ansible +export os_network_dev=network_name -# list of distro-specific images/flavors +# per-distribution dictionary with images/flavors os_flavor_ids["fedora20"]="2" os_image_ids["fedora20"]="0461eef2-5921-4c01-95a6-6edf96d41b89" |