From 7f3e0742c47a797a5af4305988fe4c86beb3187d Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Fri, 18 Jan 2019 10:48:33 -0800
Subject: [PATCH] Add FLAVOR as a constant.

Change-Id: I60842ecf2cff3e2018931a250b9e5f11453e3d04
---
 octavia_lib/common/constants.py |  1 +
 tox.ini                         | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/octavia_lib/common/constants.py b/octavia_lib/common/constants.py
index a8eaf27..cdeb6ec 100644
--- a/octavia_lib/common/constants.py
+++ b/octavia_lib/common/constants.py
@@ -33,6 +33,7 @@ HEALTHMONITORS = 'healthmonitors'
 MEMBERS = 'members'
 L7POLICIES = 'l7policies'
 L7RULES = 'l7rules'
+FLAVOR = 'flavor'
 
 # ID fields
 ID = 'id'
diff --git a/tox.ini b/tox.ini
index fe05696..5093a73 100644
--- a/tox.ini
+++ b/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]