# HG changeset patch
# User david.comay@oracle.com
# Date 1455240902 28800
# Node ID ba6fc2429fb02f3f6de10b7ae1c2e91d0ed01c0a
# Parent  56f4540f741d04f8bf59c79b6c3029e935f68be6
22695176 Miscellaneous package cleanup for Kilo

diff -r 56f4540f741d -r ba6fc2429fb0 components/openstack/horizon/files/branding/css/solaris1.css
--- a/components/openstack/horizon/files/branding/css/solaris1.css	Thu Feb 11 17:35:02 2016 -0800
+++ b/components/openstack/horizon/files/branding/css/solaris1.css	Thu Feb 11 17:35:02 2016 -0800
@@ -9689,7 +9689,7 @@
     margin: 0 0 1px; }
 .topbar {
   height: 79px;
-  background: url('/horizon/static/dashboard/img/Openstack_banner.png?35927ebeff67') repeat; }
+  background: url('/horizon/static/dashboard/img/OpenStack_banner.png?35927ebeff67') repeat; }
   .topbar h1.brand {
     display: inline-block;
     width: 311px;
diff -r 56f4540f741d -r ba6fc2429fb0 components/openstack/horizon/files/branding/img/OpenStack_banner.png
Binary file components/openstack/horizon/files/branding/img/OpenStack_banner.png has changed
diff -r 56f4540f741d -r ba6fc2429fb0 components/openstack/horizon/files/branding/img/Openstack_banner.png
Binary file components/openstack/horizon/files/branding/img/Openstack_banner.png has changed
diff -r 56f4540f741d -r ba6fc2429fb0 components/openstack/horizon/horizon.p5m
--- a/components/openstack/horizon/horizon.p5m	Thu Feb 11 17:35:02 2016 -0800
+++ b/components/openstack/horizon/horizon.p5m	Thu Feb 11 17:35:02 2016 -0800
@@ -274,6 +274,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templates/horizon/common/_workflow_base.html
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templates/horizon/common/_workflow_step.html
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templates/horizon/common/_workflow_step_update_members.html
+file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templates/horizon/jasmine/index.html
+file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templates/horizon/jasmine/jasmine.html
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templates/horizon/qunit.html
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templatetags/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/horizon/templatetags/branding.py
@@ -1554,7 +1556,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/fonts/Anivers_Regular-webfont.ttf
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/fonts/Anivers_Regular-webfont.woff
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/OpenStack_Dashboard_txt.png
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/Openstack_banner.png
+file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/OpenStack_banner.png
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/OracleSolaris_Logo.png
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/OracleSolaris_login_banner.png
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/dashboard/img/Oracle_Logo.png
@@ -2294,12 +2296,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/lib/spin.jquery.js
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/lib/spin.js
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/lib/term.js
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/tests/instances.js
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/tests/jasmine/utils.spec.js
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/tests/messages.js
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/tests/modals.js
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/tests/tables.js
-file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/horizon/tests/templates.js
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/themes/blue/_styles.scss
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/themes/blue/_variables.scss
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_dashboard/static/themes/default/_styles.scss
diff -r 56f4540f741d -r ba6fc2429fb0 components/openstack/ironic/ironic.p5m
--- a/components/openstack/ironic/ironic.p5m	Thu Feb 11 17:35:02 2016 -0800
+++ b/components/openstack/ironic/ironic.p5m	Thu Feb 11 17:35:02 2016 -0800
@@ -25,9 +25,9 @@
 
 set name=pkg.fmri \
     value=pkg:/cloud/openstack/ironic@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="OpenStack Ironic"
+set name=pkg.summary value="OpenStack Ironic (Bare Metal Service)"
 set name=pkg.description \
-    value="Provisioning of bare metal instances in OpenStack."
+    value="OpenStack Ironic provides a service to provision bare metal machines instead of virtual machines. By default, it will use PXE and IPMI in concert to provision and turn on/off machines, but also supports vendor-specific plugins which may implement additional functionality."
 set name=pkg.human-version value="Kilo $(COMPONENT_VERSION)"
 set name=com.oracle.info.description \
     value="Ironic, the OpenStack bare metal provisioning service"
diff -r 56f4540f741d -r ba6fc2429fb0 components/openstack/keystone/keystone.p5m
--- a/components/openstack/keystone/keystone.p5m	Thu Feb 11 17:35:02 2016 -0800
+++ b/components/openstack/keystone/keystone.p5m	Thu Feb 11 17:35:02 2016 -0800
@@ -58,6 +58,9 @@
     group=keystone mode=0644 overlay=allow preserve=renamenew
 file etc/policy.v3cloudsample.json path=etc/keystone/policy.v3cloudsample.json \
     owner=keystone group=keystone mode=0644 overlay=allow preserve=renamenew
+file etc/sso_callback_template.html \
+    path=etc/keystone/sso_callback_template.html owner=keystone \
+    group=keystone mode=0644 overlay=allow preserve=renamenew
 file files/keystone.auth_attr \
     path=etc/security/auth_attr.d/cloud:openstack:keystone group=sys
 file files/keystone.exec_attr \
@@ -313,28 +316,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/mapping_backends/mapping.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/mapping_backends/sql.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystone/identity/routers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/de/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/en_AU/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/es/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/fr/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/fr/LC_MESSAGES/keystone-log-error.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/fr/LC_MESSAGES/keystone-log-info.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/hu/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/it/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/ja/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/keystone-log-critical.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/keystone-log-error.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/keystone-log-info.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/keystone-log-warning.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/keystone.pot
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/ko_KR/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/pl_PL/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/pt_BR/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/ru/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-critical.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-error.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/zh_CN/LC_MESSAGES/keystone-log-info.po
-file path=usr/lib/python$(PYVER)/vendor-packages/keystone/locale/zh_TW/LC_MESSAGES/keystone-log-critical.po
 file path=usr/lib/python$(PYVER)/vendor-packages/keystone/middleware/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystone/middleware/core.py
 file path=usr/lib/python$(PYVER)/vendor-packages/keystone/middleware/ec2_token.py