Merge "Enable fluentd for horizon"
diff --git a/horizon/files/horizon_settings/_horizon_settings.py b/horizon/files/horizon_settings/_horizon_settings.py
index bac4769..a95f48a 100644
--- a/horizon/files/horizon_settings/_horizon_settings.py
+++ b/horizon/files/horizon_settings/_horizon_settings.py
@@ -22,6 +22,7 @@
SESSION_TIMEOUT = {{ server.get('session', {}).get('timeout', 3600) }}
SESSION_ENGINE = "django.contrib.sessions.backends.{{ server.get('session', {}).get('engine', 'signed_cookies') }}"
+DROPDOWN_MAX_ITEMS = {{ server.get('dropdown_max_items', 30) }}
# Path to directory containing policy.json files
POLICY_FILES_PATH = "{{ server.get('policy_files_path') }}"
diff --git a/horizon/files/horizon_settings/_local_settings.py b/horizon/files/horizon_settings/_local_settings.py
index fb340bc..ba4c97f 100644
--- a/horizon/files/horizon_settings/_local_settings.py
+++ b/horizon/files/horizon_settings/_local_settings.py
@@ -151,6 +151,24 @@
API_MASK_URL = '{{ plugin.mask_url }}'
{%- endif %}
+{%- if plugin_name == "avinetworks" %}
+
+# AVINETWORKS LBAAS CONFIG
+from openstack_dashboard.utils import settings as utsettings
+import avidashboard.enabled
+orig_func = utsettings.update_dashboards
+
+def new_update_dashboards(modules, config, apps):
+ modules.append(avidashboard.enabled)
+ return orig_func(modules, config, apps)
+
+utsettings.update_dashboards = new_update_dashboards
+AVI_CONTROLLER = {"{{plugin.control.region}}": "{{plugin.control.address}}" }
+AVI_LBAAS_FULL_UI = {{plugin.control.full_ui}}
+AVI_LBAAS_FULL_READONLY_UI = {{plugin.control.read_only}}
+AVI_LBAAS_PANEL_NAME = {{ plugin.control.get('panel_name', "AVI LBaaS Analytics") }}
+{%- endif %}
+
{%- if plugin.config is defined %}
{{ plugin_name|upper }}_CONFIG = {{ plugin.config|python }}
{%- endif %}
diff --git a/horizon/files/local_settings/pike_settings.py b/horizon/files/local_settings/pike_settings.py
new file mode 120000
index 0000000..206c21a
--- /dev/null
+++ b/horizon/files/local_settings/pike_settings.py
@@ -0,0 +1 @@
+ocata_settings.py
\ No newline at end of file
diff --git a/horizon/files/policy/pike b/horizon/files/policy/pike
new file mode 120000
index 0000000..d5e8ce2
--- /dev/null
+++ b/horizon/files/policy/pike
@@ -0,0 +1 @@
+ocata
\ No newline at end of file
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 78dd2c1..868a639 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -111,7 +111,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}