Merge "Removing keystonercv2 link from horizon UI in queens and newer."
diff --git a/horizon/files/horizon_settings/_keystone_settings.py b/horizon/files/horizon_settings/_keystone_settings.py
index c31f721..2448a71 100644
--- a/horizon/files/horizon_settings/_keystone_settings.py
+++ b/horizon/files/horizon_settings/_keystone_settings.py
@@ -27,6 +27,15 @@
# with Keystone V3. All entities will be created in the default domain.
# OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'Default'
+{%- if server.get('version','pike') not in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata", "pike"] %}
+ {%- if app.api_versions is defined and app.api_versions.get('identity', 2) | int == 3 %}
+
+# Controls whether the keystone v2 openrc file is accessable from the user menu
+# and the api access panel.
+SHOW_KEYSTONE_V2_RC = False
+ {%- endif %}
+{%- endif %}
+
# For multiple regions uncomment this configuration, and add (endpoint, title).
# AVAILABLE_REGIONS = [
# ('http://cluster1.example.com:5000/v2.0', 'cluster1'),
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 9761585..1f05f1c 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -40,6 +40,9 @@
virtualenv $VENV_DIR
source ${VENV_DIR}/bin/activate
python -m pip install salt${PIP_SALT_VERSION}
+ if [[ -f ${CURDIR}/test-requirements.txt ]]; then
+ python -m pip install -r ${CURDIR}/test-requirements.txt
+ fi
}
setup_mock_bin() {
diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt
new file mode 100644
index 0000000..bc7dc7f
--- /dev/null
+++ b/tests/test-requirements.txt
@@ -0,0 +1,4 @@
+jsonschema
+reno
+setuptools<45.0.0
+msgpack<1.0.0