diff options
| author |   xudan <xudan16@huawei.com> | 2017-03-15 10:17:08 +0000 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-03-20 01:24:08 +0000 |
| commit | 3cf37c9ac7b40a388f81fed13cfb0ad606dcd9a1 (patch) | |
| tree | eb283d7c2693bf1fefefd7e0b7c59cca3107be02 /dovetail/conf | |
| parent | 04a464ac81ac43f536ba73af3666a149c97f8369 (diff) | |
dovetail tool: change name of credentials from creds to openrc
1. change file name from openstack.creds to openrc.sh
2. change the cmd --creds to --openrc/-o
3. now the path of --openrc can be relative path no restrict to abspath
4. remove the useless "work_dir" in dovetail_config.yml
JIRA: DOVETAIL-369
JIRA: DOVETAIL-367
Change-Id: I2592438eef060f84132ff7fa226aea93ea947362
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/conf')
| -rw-r--r-- | dovetail/conf/cmd_config.yml | 7 | ||||
| -rw-r--r-- | dovetail/conf/dovetail_config.yml | 3 | ||||
| -rw-r--r-- | dovetail/conf/functest_config.yml | 2 | ||||
| -rw-r--r-- | dovetail/conf/yardstick_config.yml | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index e66434b0..05567709 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -53,11 +53,12 @@ cli: path: - 'functest/docker_tag' help: 'Overwrite tag for functest docker container (e.g. stable or latest)' - creds: + openrc: flags: - - '--creds' + - '--openrc' + - '-o' path: - - 'creds' + - 'openrc' help: 'Openstack Credential file location' control: testsuite: diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index f8f18e46..9d2c0cf3 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -1,11 +1,10 @@ --- -work_dir: /home/opnfv/dovetail result_dir: /home/opnfv/dovetail/results report_file: 'dovetail_report.txt' cli_file_name: 'cmd_config.yml' # OPENSTACK Credential file -creds: '/home/opnfv/dovetail/openstack.creds' +openrc: '/home/opnfv/dovetail/openrc.sh' repo: tag: tag_name diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml index 7182b27d..2fca713d 100644 --- a/dovetail/conf/functest_config.yml +++ b/dovetail/conf/functest_config.yml @@ -24,4 +24,4 @@ functest: file_path: 'functest_result.json' tp_path: 'tempest/tempest.log' db_url: 'http://testresults.opnfv.org/test/api/v1/results?case=%s&last=1' - creds: '/home/opnfv/functest/conf/openstack.creds' + openrc: '/home/opnfv/functest/conf/openstack.creds' diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml index a7544f0c..029100cd 100644 --- a/dovetail/conf/yardstick_config.yml +++ b/dovetail/conf/yardstick_config.yml @@ -25,4 +25,4 @@ yardstick: store_type: 'file' file_path: 'yardstick.log' db_url: 'http://testresults.opnfv.org/test/api/v1/results?case=%s&last=1' - creds: '/home/opnfv/openrc' + openrc: '/home/opnfv/openrc' |