Merge "Add FLAVOR as a constant."

octavia_lib/common/constants.py

@@ -33,6 +33,7 @@ HEALTHMONITORS = 'healthmonitors'
 MEMBERS = 'members'
 L7POLICIES = 'l7policies'
 L7RULES = 'l7rules'
+FLAVOR = 'flavor'
 
 # ID fields
 ID = 'id'

tox.ini

@@ -9,13 +9,14 @@ install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
-   OS_STDOUT_CAPTURE=1
-   OS_STDERR_CAPTURE=1
+   OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
+   OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
+   OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
    OS_TEST_TIMEOUT=60
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]