diff --git a/.zuul.yaml b/.zuul.yaml index 39d513e5..11547c39 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -14,10 +14,8 @@ h-eng: true tox_envlist: functional tox_environment: + # NOTE(amorin) is it still needed? IDENTITY_API_VERSION: 3 - PYTHONUNBUFFERED: 'true' - MISTRAL_USE_MOD_WSGI: true - MISTRAL_RPC_IMPLEMENTATION: oslo MYSQL_ROOT_PW: secretdatabase required-projects: - openstack/heat diff --git a/mistralclient/tests/functional/cli/v2/base_v2.py b/mistralclient/tests/functional/cli/v2/base_v2.py index 474b8bbd..b0316c80 100644 --- a/mistralclient/tests/functional/cli/v2/base_v2.py +++ b/mistralclient/tests/functional/cli/v2/base_v2.py @@ -21,7 +21,9 @@ from tempest.lib import exceptions from mistralclient.tests.functional.cli import base -MISTRAL_URL = "http://localhost:8989/v2" +# NOTE(amorin) this is the hardcoded mistral URL in devstack +# Since we moved to uwsgi, this is behind apache ProxyPass /workflow +MISTRAL_URL = "http://localhost/workflow/v2" class MistralClientTestBase(base.MistralCLIAuth, base.MistralCLIAltAuth): diff --git a/mistralclient/tests/functional/cli/v2/test_cli_v2.py b/mistralclient/tests/functional/cli/v2/test_cli_v2.py index 87b0cb6b..ad2040c6 100644 --- a/mistralclient/tests/functional/cli/v2/test_cli_v2.py +++ b/mistralclient/tests/functional/cli/v2/test_cli_v2.py @@ -21,7 +21,9 @@ from mistralclient.tests.functional.cli import base from mistralclient.tests.functional.cli.v2 import base_v2 -MISTRAL_URL = "http://localhost:8989/v2" +# NOTE(amorin) this is the hardcoded mistral URL in devstack +# Since we moved to uwsgi, this is behind apache ProxyPass /workflow +MISTRAL_URL = "http://localhost/workflow/v2" class SimpleMistralCLITests(base.MistralCLIAuth):