In-house patch to remove the imports of xstatic packages. These
imports are no longer needed as the static assets are collected at
package time and the xstatic modules are not being delivered.
NOTE: This patch is applied AFTER gmake install has completed rather
than during gmake prep. We need the xstatic functionality to collect
all the JavaScript libraries before packaging.
--- /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py.~1~ 2016-04-26 02:16:33.459370382 -0800
+++ /usr/lib/python2.7/vendor-packages/openstack_dashboard/static_settings.py 2016-04-26 02:17:12.667657098 -0800
@@ -18,117 +18,11 @@ to match their distribution's standards.
"""
import os
-
-import xstatic.main
-import xstatic.pkg.angular
-import xstatic.pkg.angular_bootstrap
-import xstatic.pkg.angular_gettext
-import xstatic.pkg.angular_lrdragndrop
-import xstatic.pkg.angular_smart_table
-import xstatic.pkg.bootstrap_datepicker
-import xstatic.pkg.bootstrap_scss
-import xstatic.pkg.bootswatch
-import xstatic.pkg.d3
-import xstatic.pkg.font_awesome
-import xstatic.pkg.hogan
-import xstatic.pkg.jquery
-import xstatic.pkg.jquery_migrate
-import xstatic.pkg.jquery_quicksearch
-import xstatic.pkg.jquery_tablesorter
-import xstatic.pkg.jquery_ui
-import xstatic.pkg.jsencrypt
-import xstatic.pkg.mdi
-import xstatic.pkg.rickshaw
-import xstatic.pkg.roboto_fontface
-import xstatic.pkg.spin
-import xstatic.pkg.termjs
-
from horizon.utils import file_discovery
def get_staticfiles_dirs(webroot='/'):
- STATICFILES_DIRS = [
- ('horizon/lib/angular',
- xstatic.main.XStatic(xstatic.pkg.angular,
- root_url=webroot).base_dir),
- ('horizon/lib/angular',
- xstatic.main.XStatic(xstatic.pkg.angular_bootstrap,
- root_url=webroot).base_dir),
- ('horizon/lib/angular',
- xstatic.main.XStatic(xstatic.pkg.angular_gettext,
- root_url=webroot).base_dir),
- ('horizon/lib/angular',
- xstatic.main.XStatic(xstatic.pkg.angular_lrdragndrop,
- root_url=webroot).base_dir),
- ('horizon/lib/angular',
- xstatic.main.XStatic(xstatic.pkg.angular_smart_table,
- root_url=webroot).base_dir),
- ('horizon/lib/bootstrap_datepicker',
- xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker,
- root_url=webroot).base_dir),
- ('bootstrap',
- xstatic.main.XStatic(xstatic.pkg.bootstrap_scss,
- root_url=webroot).base_dir),
- ('horizon/lib/bootswatch',
- xstatic.main.XStatic(xstatic.pkg.bootswatch,
- root_url=webroot).base_dir),
- ('horizon/lib',
- xstatic.main.XStatic(xstatic.pkg.d3,
- root_url=webroot).base_dir),
- ('horizon/lib',
- xstatic.main.XStatic(xstatic.pkg.hogan,
- root_url=webroot).base_dir),
- ('horizon/lib/font-awesome',
- xstatic.main.XStatic(xstatic.pkg.font_awesome,
- root_url=webroot).base_dir),
- ('horizon/lib/jquery',
- xstatic.main.XStatic(xstatic.pkg.jquery,
- root_url=webroot).base_dir),
- ('horizon/lib/jquery',
- xstatic.main.XStatic(xstatic.pkg.jquery_migrate,
- root_url=webroot).base_dir),
- ('horizon/lib/jquery',
- xstatic.main.XStatic(xstatic.pkg.jquery_quicksearch,
- root_url=webroot).base_dir),
- ('horizon/lib/jquery',
- xstatic.main.XStatic(xstatic.pkg.jquery_tablesorter,
- root_url=webroot).base_dir),
- ('horizon/lib/jsencrypt',
- xstatic.main.XStatic(xstatic.pkg.jsencrypt,
- root_url=webroot).base_dir),
- ('horizon/lib/mdi',
- xstatic.main.XStatic(xstatic.pkg.mdi,
- root_url=webroot).base_dir),
- ('horizon/lib',
- xstatic.main.XStatic(xstatic.pkg.rickshaw,
- root_url=webroot).base_dir),
- ('horizon/lib/roboto_fontface',
- xstatic.main.XStatic(xstatic.pkg.roboto_fontface,
- root_url=webroot).base_dir),
- ('horizon/lib',
- xstatic.main.XStatic(xstatic.pkg.spin,
- root_url=webroot).base_dir),
- ('horizon/lib',
- xstatic.main.XStatic(xstatic.pkg.termjs,
- root_url=webroot).base_dir),
- ]
-
- if xstatic.main.XStatic(xstatic.pkg.jquery_ui,
- root_url=webroot).version.startswith('1.10.'):
- # The 1.10.x versions already contain the 'ui' directory.
- STATICFILES_DIRS.append(
- ('horizon/lib/jquery-ui',
- xstatic.main.XStatic(xstatic.pkg.jquery_ui,
- root_url=webroot).base_dir))
- else:
- # Newer versions dropped the directory, add it to keep the path the
- # same.
- STATICFILES_DIRS.append(
- ('horizon/lib/jquery-ui/ui',
- xstatic.main.XStatic(xstatic.pkg.jquery_ui,
- root_url=webroot).base_dir))
-
- return STATICFILES_DIRS
+ return []
def find_static_files(HORIZON_CONFIG):