summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/conf/bottlenecks_config.yml2
-rw-r--r--etc/conf/functest_config.yml1
-rw-r--r--etc/testcase/ha.tc011.yml2
-rw-r--r--etc/userconfig/env_config.sh.sample35
4 files changed, 38 insertions, 2 deletions
diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index f33e50f1..005a04e3 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -10,7 +10,7 @@ bottlenecks:
(openstack --insecure image list | grep cirros-0.3.5 ||
openstack --insecure image create cirros-0.3.5
--disk-format qcow2 --container-format bare
- --file /home/opnfv/userconfig/pre_config/cirros-0.3.5-x86_64-disk.img)'
+ --file /home/opnfv/userconfig/images/cirros-0.3.5-x86_64-disk.img)'
- 'source /tmp/admin_rc.sh &&
(openstack --insecure flavor list | grep yardstick-flavor ||
openstack --insecure flavor create --id 100
diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml
index 896aeb95..e34fa60f 100644
--- a/etc/conf/functest_config.yml
+++ b/etc/conf/functest_config.yml
@@ -5,6 +5,7 @@ functest:
opts: '-id --privileged=true'
config:
dir: '/home/opnfv/userconfig'
+ images: '/home/opnfv/functest/images'
pre_condition:
- 'echo test for precondition in functest'
cmds:
diff --git a/etc/testcase/ha.tc011.yml b/etc/testcase/ha.tc011.yml
index d1268826..e7e67e75 100644
--- a/etc/testcase/ha.tc011.yml
+++ b/etc/testcase/ha.tc011.yml
@@ -8,7 +8,7 @@ dovetail.ha.tc011:
pre_condition:
- 'source /etc/yardstick/openstack.creds && openstack --insecure image create cirros-ha-11
--disk-format qcow2 --container-format bare --public
- --file /home/opnfv/userconfig/pre_config/cirros-0.3.5-x86_64-disk.img'
+ --file /home/opnfv/userconfig/images/cirros-0.3.5-x86_64-disk.img'
cmds:
- 'mkdir -p /home/opnfv/yardstick/results/'
- "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds &&
diff --git a/etc/userconfig/env_config.sh.sample b/etc/userconfig/env_config.sh.sample
new file mode 100644
index 00000000..4bb77ab6
--- /dev/null
+++ b/etc/userconfig/env_config.sh.sample
@@ -0,0 +1,35 @@
+# Project-level authentication scope (name or ID), recommend admin project.
+export OS_PROJECT_NAME=admin
+
+# For identity v2, it uses OS_TENANT_NAME rather than OS_PROJECT_NAME.
+export OS_TENANT_NAME=admin
+
+# Authentication username, belongs to the project above, recommend admin user.
+export OS_USERNAME=admin
+
+# Authentication password. Use your own password
+export OS_PASSWORD=xxxxxxxx
+
+# Authentication URL, one of the endpoints of keystone service. If this is v3 version,
+# there need some extra variables as follows.
+export OS_AUTH_URL='http://xxx.xxx.xxx.xxx:5000/v3'
+
+# Default is 2.0. If use keystone v3 API, this should be set as 3.
+export OS_IDENTITY_API_VERSION=3
+
+# Domain name or ID containing the user above.
+# Command to check the domain: openstack user show <OS_USERNAME>
+export OS_USER_DOMAIN_NAME=default
+
+# Domain name or ID containing the project above.
+# Command to check the domain: openstack project show <OS_PROJECT_NAME>
+export OS_PROJECT_DOMAIN_NAME=default
+
+# Special environment parameters for https.
+# If using https + cacert, the path of cacert file should be provided.
+# The cacert file should be put at $DOVETAIL_HOME/pre_config.
+#export OS_CACERT=/path/to/pre_config/cacert.pem
+
+# If using https + no cacert, should add OS_INSECURE environment parameter.
+#export OS_INSECURE=True
+