diff options
| author |   xudan <xudan16@huawei.com> | 2018-04-25 03:35:02 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-05-07 02:54:02 -0400 |
| commit | 27109727907de0a275946765b201fbc0bd71116f (patch) | |
| tree | ad8553f952bfead5b69be50d7a3f9a4290dccd80 /etc | |
| parent | e112118754bbd297de52538d003fc21273e9cf3d (diff) | |
Decoupling Bottlenecks Docker config items from source code
There are some special Docker setting items when creating
Bottlenecks Docker Cntainers.
Move the special settings to config files.
Disable the function to push results to DB.
JIRA: DOVETAIL-645
Change-Id: Icc033222edf74c0fe4853dede2794f4226fd4252
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/conf/bottlenecks_config.yml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml index 005a04e3..3004e91c 100644 --- a/etc/conf/bottlenecks_config.yml +++ b/etc/conf/bottlenecks_config.yml @@ -1,8 +1,20 @@ --- + +{% set validate_testcase = validate_testcase or '' %} +{% set testcase = testcase or '' %} +{% set os_insecure = os_insecure or 'False' %} +{% set os_cacert = '' %} +{% if os_insecure == 'True' %} + {% set os_cacert = ' -e OS_CACERT=False ' %} +{% endif %} + bottlenecks: image_name: opnfv/bottlenecks docker_tag: stable opts: '-id --privileged=true' + envs: '{{os_cacert}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out' + volumes: + - '-v /var/run/docker.sock:/var/run/docker.sock' config: dir: '/home/opnfv/userconfig' pre_condition: |