author | Matt Keenan <matt.keenan@oracle.com> |
Fri, 30 Sep 2016 21:38:41 +0100 | |
changeset 7008 | a33a24a8fc91 |
parent 7007 | 8aba3abf65e1 |
child 7009 | 5679650830e7 |
--- a/components/openstack/horizon/Makefile Fri Sep 30 07:50:02 2016 -0700 +++ b/components/openstack/horizon/Makefile Fri Sep 30 21:38:41 2016 +0100 @@ -51,11 +51,12 @@ TPNO_D3= 20822 TPNO_FONT_AWESOME= 25763 TPNO_HOGAN= 21827 +TPNO_IRONIC_UI= 31179 TPNO_JQUERY= 21642 TPNO_JQUERY_MIGRATE= 13315 -TPNO_JQUERY_UI= 18416 TPNO_JQUERY_QUICKSEARCH= 20396 TPNO_JQUERY_TABLESORTER= 20824 +TPNO_JQUERY_UI= 18416 TPNO_JSENCRYPT= 20397 TPNO_MDI= 30294 TPNO_RICKSHAW= 20673 @@ -281,6 +282,15 @@ COMPONENT_ARCHIVE_URL_24 = $(call pypi_url,24) PKG_MACROS += VERSION_ROBOTO_FF=$(basename $(COMPONENT_VERSION_24)) +COMPONENT_NAME_25 = ironic-ui +COMPONENT_VERSION_25 = 1.1.2 +COMPONENT_SRC_25 = ironic-ui-$(COMPONENT_VERSION_25) +COMPONENT_ARCHIVE_25 = ironic-ui-$(COMPONENT_VERSION_25).tar.gz +COMPONENT_ARCHIVE_HASH_25 = \ + sha256:4db1d1516b1fde1b917cb8a87a877d3e470e8159a84ad0dc989ec4e71f17a7fd +COMPONENT_ARCHIVE_URL_25 = $(call pypi_url,25) +PKG_MACROS += VERSION_IRONIC_UI=$(COMPONENT_VERSION_25) + PKG_VARS += COMPONENT_BE_VERSION include $(WS_MAKE_RULES)/prep.mk @@ -338,6 +348,7 @@ cd $(PROTO_PYTHON_LIB)/openstack_dashboard; \ $(CP) $(COMPONENT_DIR)/files/local_settings_static.py \ local/local_settings.py; \ + $(CP) ../ironic_ui/enabled/_2200_ironic.py enabled; \ $(ENV) PYTHONPATH=$(PROTO_PYTHON_LIB) ./manage.py \ collectstatic --noinput -v 0; \ $(ENV) PYTHONPATH=$(PROTO_PYTHON_LIB) ./manage.py compress -v 0; \ @@ -385,7 +396,7 @@ ifneq ($(BUILD_TYPE), evaluation) .PHONY: xstatic xstatic: $(PROTO_DIR) build - for xs_archive in $$(ls -d XStatic-* | grep -v .tar.gz); do \ + for xs_archive in $$(ls -d XStatic-* ironic-ui-* | grep -v .tar.gz); do \ cd $$xs_archive; \ $(ENV) $(PYTHON.$(BITS)) ./setup.py build; \ $(ENV) $(PYTHON.$(BITS)) ./setup.py install \ @@ -411,10 +422,6 @@ system-test: $(NO_TESTS) -clean:: - gfind $(COMPONENT_DIR) -maxdepth 1 -type d -name "XStatic*" \ - -exec rm -r {} \; - # Includes packages required by Django's manage.py during the Horizon build REQUIRED_PACKAGES += library/python/babel-27 REQUIRED_PACKAGES += library/python/ceilometerclient-27
--- a/components/openstack/horizon/horizon.p5m Fri Sep 30 07:50:02 2016 -0700 +++ b/components/openstack/horizon/horizon.p5m Fri Sep 30 21:38:41 2016 +0100 @@ -39,7 +39,8 @@ set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION) set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/058 \ - value=PSARC/2015/110 value=PSARC/2015/535 value=PSARC/2016/455 + value=PSARC/2015/110 value=PSARC/2015/535 value=PSARC/2016/455 \ + value=PSARC/2016/545 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) # file openstack_dashboard/local/local_settings.d/_10_set_custom_theme.py.example \ @@ -441,6 +442,39 @@ file path=usr/lib/python$(PYVER)/vendor-packages/horizon/workflows/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/horizon/workflows/base.py file path=usr/lib/python$(PYVER)/vendor-packages/horizon/workflows/views.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/PKG-INFO +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/SOURCES.txt +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/dependency_links.txt +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/not-zip-safe +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/pbr.json +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/requires.txt +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui-$(COMPONENT_VERSION_25)-py$(PYVER).egg-info/top_level.txt +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/api/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/api/ironic.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/api/ironic_rest_api.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/ironic/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/ironic/panel.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/ironic/templates/ironic/index.html +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/ironic/templates/ironic/node_detail.html +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/ironic/urls.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/content/ironic/views.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/enabled/_2200_ironic.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/enabled/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/ironic.module.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/ironic.service.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/maintenance/maintenance.controller.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/maintenance/maintenance.html +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/maintenance/maintenance.service.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-actions.service.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-details/node-details.controller.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-details/node-details.controller.spec.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-details/node-details.html +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-details/sections/configuration.html +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-details/sections/overview.html +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-list/node-list.controller.js +file path=usr/lib/python$(PYVER)/vendor-packages/ironic_ui/static/dashboard/admin/ironic/node-list/node-list.html file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/.eslintrc file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/api/__init__.py @@ -1496,6 +1530,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_2120_admin_defaults_panel.py file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_2130_admin_metadata_defs_panel.py file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_2140_admin_info_panel.py +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_2200_ironic.py file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_3000_identity.py file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_3010_identity_domains_panel.py file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/enabled/_3020_identity_projects_panel.py @@ -1764,6 +1799,19 @@ file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/flavors/table/flavors-table.controller.js file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/flavors/table/flavors-table.controller.spec.js file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/flavors/table/flavors-table.html +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/ironic.module.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/ironic.service.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/maintenance/maintenance.controller.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/maintenance/maintenance.html +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/maintenance/maintenance.service.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-actions.service.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-details/node-details.controller.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-details/node-details.controller.spec.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-details/node-details.html +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-details/sections/configuration.html +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-details/sections/overview.html +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-list/node-list.controller.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/admin/ironic/node-list/node-list.html file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/css/34f8a8f8d5e5.css file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/css/9b66f35f3b6d.css file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/css/9c826ac2576b.css @@ -1882,9 +1930,9 @@ file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/wait-gray.svg file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/wait-green.svg file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/wait-red.svg -file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/js/40e8171c2bf7.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/js/45df751e168f.js +file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/js/4c118335b955.js file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/js/7fd3f7d69c71.js -file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/js/e19f3eb96d27.js file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/manifest.json file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/project/containers/_containers.scss file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/project/containers/containers-model.service.js @@ -3113,6 +3161,11 @@ com.oracle.info.name=$(COMPONENT_NAME) \ com.oracle.info.tpno=$(TPNO_HORIZON) \ com.oracle.info.version=$(IPS_COMPONENT_VERSION) +license ironic-ui.license license="Apache v2.0" \ + com.oracle.info.description="Bare Metal Provisioning Plugin" \ + com.oracle.info.name=$(COMPONENT_NAME_25) \ + com.oracle.info.tpno=$(TPNO_IRONIC_UI) \ + com.oracle.info.version=$(VERSION_IRONIC_UI) license bootstrap-datepicker.license \ license="Apache v2.0 (bootstrap-datepicker)" \ com.oracle.info.description="Bootstrap Datepicker JavaScript Library" \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openstack/horizon/ironic-ui.license Fri Sep 30 21:38:41 2016 +0100 @@ -0,0 +1,176 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openstack/horizon/patches/21-launchpad-1609005.patch_25 Fri Sep 30 21:38:41 2016 +0100 @@ -0,0 +1,47 @@ +Patch to dynamically load panel only of ironic service is configured +Fixed in upstream via Launchpad bug 1609005 and changeset +31c70d956262dab46ad263d42581c04e69fd85c4 +Fix included in release 2.0.0 + +commit 31c70d956262dab46ad263d42581c04e69fd85c4 +Author: Tyr Johanson <[email protected]> +Date: Tue Aug 16 10:28:40 2016 -0600 + + Hide panel if 'baremetal' service not present + + Don't show the ironic panel unless the service is present in the + service catalog. Also, restrict the panel to admin permission. + + Change-Id: I413d50133e743a7bdc45378e3ed0454974b7b3c7 + Closes-Bug: 1609005 + +--- ironic-ORIG/ironic_ui/content/ironic/panel.py 2016-08-17 10:27:15.935362835 +0100 ++++ ironic-ui-1.1.2/ironic_ui/content/ironic/panel.py 2016-08-17 10:28:38.290465910 +0100 +@@ -17,7 +17,27 @@ + + import horizon + ++from openstack_dashboard.api import base ++from openstack_dashboard.dashboards.admin import dashboard ++ + + class Ironic(horizon.Panel): + name = _("Ironic Bare Metal Provisioning") + slug = 'ironic' ++ permissions = ('openstack.roles.admin',) ++ ++ def allowed(self, context): ++ request = context['request'] ++ if not base.is_service_enabled(request, 'baremetal'): ++ return False ++ else: ++ return super(Ironic, self).allowed(context) ++ ++ def nav(self, context): ++ request = context['request'] ++ if not base.is_service_enabled(request, 'baremetal'): ++ return False ++ else: ++ return True ++ ++dashboard.Admin.register(Ironic)