# HG changeset patch
# User david.comay@oracle.com
# Date 1455240900 28800
# Node ID 508add8f43f1660ca24eb763c4f20ab80c7a2692
# Parent  27d201e3362bd6f6eaed87e7631013e52a3830fe
22694680 Dependencies in several OpenStack service packages can be improved

diff -r 27d201e3362b -r 508add8f43f1 components/openstack/horizon/Makefile
--- a/components/openstack/horizon/Makefile	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/horizon/Makefile	Thu Feb 11 17:35:00 2016 -0800
@@ -361,7 +361,7 @@
 	    -exec rm -r {} \;
 
 
-# Packages required by Django's manage.py during the Horizon build
+# Includes packages required by Django's manage.py during the Horizon build
 REQUIRED_PACKAGES += library/python/babel-27
 REQUIRED_PACKAGES += library/python/ceilometerclient-27
 REQUIRED_PACKAGES += library/python/cinderclient-27
@@ -373,13 +373,22 @@
 REQUIRED_PACKAGES += library/python/heatclient-27
 REQUIRED_PACKAGES += library/python/iso8601-27
 REQUIRED_PACKAGES += library/python/keystoneclient-27
-REQUIRED_PACKAGES += library/python/lockfile-27
+REQUIRED_PACKAGES += library/python/netaddr-27
 REQUIRED_PACKAGES += library/python/neutronclient-27
 REQUIRED_PACKAGES += library/python/novaclient-27
 REQUIRED_PACKAGES += library/python/oslo.concurrency-27
 REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/oslo.i18n-27
+REQUIRED_PACKAGES += library/python/oslo.serialization-27
+REQUIRED_PACKAGES += library/python/oslo.utils-27
+REQUIRED_PACKAGES += library/python/pbr-27
+REQUIRED_PACKAGES += library/python/pytz-27
+REQUIRED_PACKAGES += library/python/pyyaml-27
 REQUIRED_PACKAGES += library/python/requests-27
 REQUIRED_PACKAGES += library/python/saharaclient-27
 REQUIRED_PACKAGES += library/python/six-27
 REQUIRED_PACKAGES += library/python/swiftclient-27
 REQUIRED_PACKAGES += library/python/troveclient-27
+REQUIRED_PACKAGES += web/server/apache-24
+REQUIRED_PACKAGES += web/server/apache-24/module/apache-ssl
+REQUIRED_PACKAGES += web/server/apache-24/module/apache-wsgi-27
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/horizon/horizon.p5m
--- a/components/openstack/horizon/horizon.p5m	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/horizon/horizon.p5m	Thu Feb 11 17:35:00 2016 -0800
@@ -2435,14 +2435,6 @@
     com.oracle.info.tpno=$(TPNO_FONT_AWESOME) \
     com.oracle.info.version=$(VERSION_FONT_AWESOME)
 
-# force a group dependency on the optional anyjson; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/anyjson-$(PYV)
-
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(PYV)
-
 # To upgrade to Kilo version, Juno version of the package must be on the system
 depend type=origin fmri=cloud/openstack/horizon@0.2014.2.2 root-image=true
 
@@ -2450,17 +2442,29 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# force a dependency on babel; pkgdepend work is needed to flush this out
+# force a dependency on package delivering httpd(8)
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/apache2/2.4/bin/httpd
+
+# force a dependency on package delivering non-FIPS mod_ssl module
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apache2/2.4/libexec/mod_ssl.so
+
+# force a dependency on package delivering mod_wsgi module
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apache2/2.4/libexec/mod_wsgi-$(PYVER).so
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/babel-$(PYV)
 
 # force a dependency on ceilometerclient; pkgdepend work is needed to flush this
-# out
+# out.
 depend type=require fmri=library/python/ceilometerclient-$(PYV)
 
-# force a dependency on cinderclient; pkgdepend work is needed to flush this out
+# force a dependency on cinderclient; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/cinderclient-$(PYV)
 
-# force a dependency on django; pkgdepend work is needed to flush this out
+# force a dependency on django; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/django-$(PYV)
 
 # force a dependency on django-pyscss; one of the applications defined in
@@ -2472,71 +2476,74 @@
 depend type=require fmri=library/python/django_compressor-$(PYV)
 
 # force a dependency on django_openstack_auth; pkgdepend work is needed to flush
-# this out
+# this out.
 depend type=require fmri=library/python/django_openstack_auth-$(PYV)
 
-# force a dependency on glanceclient; pkgdepend work is needed to flush this out
+# force a dependency on glanceclient; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/glanceclient-$(PYV)
 
-# force a dependency on heatclient; pkgdepend work is needed to flush this out
+# force a dependency on heatclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/heatclient-$(PYV)
 
-# force a dependency on httplib2; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python/httplib2-$(PYV)
-
-# force a dependency on iso8601; pkgdepend work is needed to flush this out
+# force a dependency on iso8601; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/iso8601-$(PYV)
 
 # force a dependency on keystoneclient; pkgdepend work is needed to flush this
-# out
+# out.
 depend type=require fmri=library/python/keystoneclient-$(PYV)
 
-# force a dependency on lockfile; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python/lockfile-$(PYV)
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/netaddr-$(PYV)
 
 # force a dependency on neutronclient; pkgdepend work is needed to flush this
-# out
+# out.
 depend type=require fmri=library/python/neutronclient-$(PYV)
 
-# force a dependency on novaclient; pkgdepend work is needed to flush this out
+# force a dependency on novaclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/novaclient-$(PYV)
 
-# force a dependency on oslo.config; pkgdepend work is needed to flush this out
+# force a dependency on oslo.concurrency; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/oslo.concurrency-$(PYV)
+
+# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.config-$(PYV)
 
-# force a dependency on pbr; pkgdepend work is needed to flush this out
+# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.i18n-$(PYV)
+
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
+depend type=require fmri=library/python/oslo.serialization-$(PYV)
+
+# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.utils-$(PYV)
+
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pbr-$(PYV)
 
-# force a dependency on pint; pkgdepend work is needed to flush this out
+# force a dependency on pint; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pint-$(PYV)
 
-# force a dependency on pytz; pkgdepend work is needed to flush this out
+# force a dependency on pytz; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pytz-$(PYV)
 
-# force a dependency on requests; pkgdepend work is needed to flush this out
+# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyyaml-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/requests-$(PYV)
 
-# force a dependency on saharaclient; pkgdepend work is needed to flush this out
+# force a dependency on saharaclient; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/saharaclient-$(PYV)
 
-# force a dependency on six; pkgdepend work is needed to flush this out
+# force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
 
-# force a dependency on swiftclient; pkgdepend work is needed to flush this out
+# force a dependency on swiftclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/swiftclient-$(PYV)
 
-# force a dependency on troveclient; pkgdepend work is needed to flush this
-# out
+# force a dependency on troveclient; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/troveclient-$(PYV)
-
-# force a dependency on the Apache web server
-depend type=require fmri=web/server/apache-24
-
-# force a dependency on the mod_ssl module
-depend type=require fmri=web/server/apache-24/module/apache-ssl
-
-# force a dependency on the mod_wsgi module
-depend type=require fmri=web/server/apache-24/module/apache-wsgi-$(PYV)
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/ironic/Makefile
--- a/components/openstack/ironic/Makefile	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/ironic/Makefile	Thu Feb 11 17:35:00 2016 -0800
@@ -61,21 +61,21 @@
 # pkgdepend(1) to find.
 #
 COMPONENT_POST_INSTALL_ACTION += \
-	($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
-	 $(CP) \
-	     files/ironic-api.xml \
-	     files/ironic-conductor.xml \
-	     files/ironic-db.xml \
-	     files/ironic-upgrade.xml \
-	     $(PROTO_DIR)/lib/svc/manifest/application/openstack/; \
-	 $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/ironic/drivers/modules; \
-	 $(CP) \
-	     files/drivers/solaris.py \
-	     $(PROTO_DIR)$(PYTHON_LIB)/ironic/drivers/; \
-	 $(CP) \
-	     files/drivers/modules/solaris_ipmitool.py \
-	     $(PROTO_DIR)$(PYTHON_LIB)/ironic/drivers/modules/; \
-	 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES))
+    ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+     $(CP) \
+	 files/ironic-api.xml \
+	 files/ironic-conductor.xml \
+	 files/ironic-db.xml \
+	 files/ironic-upgrade.xml \
+	 $(PROTO_DIR)/lib/svc/manifest/application/openstack/; \
+     $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/ironic/drivers/modules; \
+     $(CP) \
+	 files/drivers/solaris.py \
+	 $(PROTO_DIR)$(PYTHON_LIB)/ironic/drivers/; \
+     $(CP) \
+	 files/drivers/modules/solaris_ipmitool.py \
+	 $(PROTO_DIR)$(PYTHON_LIB)/ironic/drivers/modules/; \
+     $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES))
 
 # common targets
 build:		$(BUILD_NO_ARCH)
@@ -93,11 +93,12 @@
 
 
 REQUIRED_PACKAGES += cloud/openstack/openstack-common
+REQUIRED_PACKAGES += install/installadm
 REQUIRED_PACKAGES += library/python/sqlalchemy-27
-REQUIRED_PACKAGES += install/installadm
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/core-os
 REQUIRED_PACKAGES += system/file-system/uafs
 REQUIRED_PACKAGES += system/file-system/uvfs
+REQUIRED_PACKAGES += system/install/auto-install/auto-install-common
 REQUIRED_PACKAGES += system/management/ipmitool
 REQUIRED_PACKAGES += web/curl
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/ironic/ironic.p5m
--- a/components/openstack/ironic/ironic.p5m	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/ironic/ironic.p5m	Thu Feb 11 17:35:00 2016 -0800
@@ -271,13 +271,8 @@
 #
 license ironic.license license="Apache 2.0"
 
-# force a group dependency on the optional anyjson; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/anyjson-$(PYV)
-
-# force a group dependency on the optional simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(PYV)
+# force a dependency on package delivering aimanifest(1M)
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/aimanifest
 
 # force a dependency on package delivering curl(1)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/curl
@@ -381,9 +376,6 @@
 # force a dependency on pecan; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pecan-$(PYV)
 
-# force a dependency on posix_ipc; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/posix_ipc-$(PYV)
-
 # force a dependency on pysendfile; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/pysendfile-$(PYV)
 
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/ironic/patches/01-requirements.patch
--- a/components/openstack/ironic/patches/01-requirements.patch	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/ironic/patches/01-requirements.patch	Thu Feb 11 17:35:00 2016 -0800
@@ -1,23 +1,30 @@
 In-house patch to remove unnecessary dependencies from Ironic's
 requirements files. The specific reasons are as follows:
 
-lxml    Not applicable
+lxml			Not applicable
 
-websockify  Not applicable
+oslo.rootwrap		Not applicable to Solaris
+
+posix-ipc		Not applicable
 
-oslo.rootwrap Not applicable to Solaris
+sqlalchemy-migrate	Not applicable
+
+websockify		Not applicable
 
---- ironic-2015.1.2/requirements.txt.orig	2015-10-19 13:49:06.006805428 -0400
-+++ ironic-2015.1.2/requirements.txt	2015-10-19 13:49:43.836513611 -0400
-@@ -5,7 +5,6 @@
+--- ironic-2015.1.2/ironic.egg-info/requires.txt.~1~	2015-10-13 10:59:16.000000000 -0700
++++ ironic-2015.1.2/ironic.egg-info/requires.txt	2016-02-01 20:03:06.190153642 -0800
+@@ -2,10 +2,8 @@ pbr!=0.7,<1.0,>=0.6
  SQLAlchemy<=0.9.99,>=0.9.7
  alembic<0.8.1,>=0.7.2
  eventlet!=0.17.0,>=0.16.1
 -lxml>=2.3
  WebOb>=1.2.3
  greenlet>=0.3.2
- sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
-@@ -18,12 +17,10 @@
+-sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
+ netaddr>=0.7.12
+ paramiko>=1.13.0
+ iso8601>=0.1.9
+@@ -15,12 +13,10 @@ python-keystoneclient<1.4.0,>=1.2.0
  python-swiftclient<2.5.0,>=2.2.0
  stevedore<1.4.0,>=1.3.0 # Apache-2.0
  pysendfile==2.0.0
@@ -30,17 +37,25 @@
  oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
  oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
  oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
---- ironic-2015.1.2/ironic.egg-info/requires.txt.orig	2015-10-19 13:50:49.380390704 -0400
-+++ ironic-2015.1.2/ironic.egg-info/requires.txt	2015-10-19 13:51:20.655399790 -0400
-@@ -2,7 +2,6 @@
+@@ -34,4 +30,3 @@ Jinja2>=2.6 # BSD License3 clause
+ keystonemiddleware<1.6.0,>=1.5.0
+ oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
+ retrying!=1.3.0,>=1.2.3 # Apache-2.0
+-posix-ipc
+--- ironic-2015.1.2/requirements.txt.~1~	2015-10-13 10:53:40.000000000 -0700
++++ ironic-2015.1.2/requirements.txt	2016-02-01 20:03:53.251275842 -0800
+@@ -5,10 +5,8 @@ pbr!=0.7,<1.0,>=0.6
  SQLAlchemy<=0.9.99,>=0.9.7
  alembic<0.8.1,>=0.7.2
  eventlet!=0.17.0,>=0.16.1
 -lxml>=2.3
  WebOb>=1.2.3
  greenlet>=0.3.2
- sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
-@@ -15,12 +14,10 @@
+-sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
+ netaddr>=0.7.12
+ paramiko>=1.13.0
+ iso8601>=0.1.9
+@@ -18,12 +16,10 @@ python-keystoneclient<1.4.0,>=1.2.0
  python-swiftclient<2.5.0,>=2.2.0
  stevedore<1.4.0,>=1.3.0 # Apache-2.0
  pysendfile==2.0.0
@@ -53,3 +68,8 @@
  oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
  oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
  oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+@@ -37,4 +33,3 @@ Jinja2>=2.6 # BSD License (3 clause)
+ keystonemiddleware<1.6.0,>=1.5.0
+ oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
+ retrying!=1.3.0,>=1.2.3 # Apache-2.0
+-posix-ipc
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/keystone/Makefile
--- a/components/openstack/keystone/Makefile	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/keystone/Makefile	Thu Feb 11 17:35:00 2016 -0800
@@ -61,14 +61,15 @@
 # manifests into the proto directory for pkgdepend(1) to find.
 #
 COMPONENT_POST_INSTALL_ACTION += \
-	($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
-	 $(CP) \
-	     files/keystone.xml \
-	     files/keystone-upgrade.xml \
-	     $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
-	 $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/keystone/httpd; \
-	 $(CP) $(SOURCE_DIR)/httpd/keystone.py $(PROTO_DIR)$(PYTHON_LIB)/keystone/httpd); \
-	 $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
+    ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+     $(CP) \
+         files/keystone.xml \
+         files/keystone-upgrade.xml \
+         $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+     $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/keystone/httpd; \
+     $(CP) $(SOURCE_DIR)/httpd/keystone.py \
+         $(PROTO_DIR)$(PYTHON_LIB)/keystone/httpd); \
+     $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
 
 # common targets
 build:		$(BUILD_NO_ARCH)
@@ -82,10 +83,10 @@
 
 REQUIRED_PACKAGES += cloud/openstack/openstack-common
 REQUIRED_PACKAGES += library/python/iniparse-27
-REQUIRED_PACKAGES += library/python/oslo.config-27
-REQUIRED_PACKAGES += library/python/pbr-27
-REQUIRED_PACKAGES += library/python/python-mysql-27
 REQUIRED_PACKAGES += library/python/sqlalchemy-27
 REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += web/server/apache-24
+REQUIRED_PACKAGES += web/server/apache-24/module/apache-ssl
+REQUIRED_PACKAGES += web/server/apache-24/module/apache-wsgi-27
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/keystone/keystone.p5m
--- a/components/openstack/keystone/keystone.p5m	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/keystone/keystone.p5m	Thu Feb 11 17:35:00 2016 -0800
@@ -413,12 +413,24 @@
 license keystone.license license="Apache v2.0"
 
 # To upgrade to Kilo version, Juno version of the package must be on the system
-depend type=origin fmri=pkg:/cloud/openstack/keystone@0.2014.2.2 root-image=true
+depend type=origin fmri=cloud/openstack/keystone@0.2014.2.2 root-image=true
+
+# force a dependency on package delivering httpd(8)
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/apache2/2.4/bin/httpd
+
+# force a dependency on package delivering non-FIPS mod_ssl module
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apache2/2.4/libexec/mod_ssl.so
+
+# force a dependency on package delivering mod_wsgi module
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/apache2/2.4/libexec/mod_wsgi-$(PYVER).so
 
 # force a dependency on package delivering openssl(1OPENSSL)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/openssl
 
-# force a dependency on cryptography; pkgdepend work is needed to flush this out.
+# force a dependency on cryptography; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/cryptography-$(PYV)
 
 # force a dependency on dogpile.cache; pkgdepend work is needed to flush this
@@ -435,9 +447,6 @@
 # force a dependency on greenlet; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/greenlet-$(PYV)
 
-# force a dependency on iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/iso8601-$(PYV)
-
 # force a dependency on jsonschema; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/jsonschema-$(PYV)
 
@@ -452,21 +461,23 @@
 # force a dependency on ldappool; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/ldappool-$(PYV)
 
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/lxml-$(PYV)
-
 # force a dependency on msgpack; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/msgpack-$(PYV)
 
 # force a dependency on oauthlib; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oauthlib-$(PYV)
 
-# force a dependency on the openstackclient module
+# force a dependency on openstackclient; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/openstackclient-$(PYV)
 
-# force a dependency on oslo.concurrency; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.concurrency; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/oslo.concurrency-$(PYV)
 
+# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.config-$(PYV)
+
 # force a dependency on oslo.db; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.db-$(PYV)
 
@@ -480,13 +491,15 @@
 # out.
 depend type=require fmri=library/python/oslo.messaging-$(PYV)
 
-# force a dependency on oslo.middleware; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.middleware; pkgdepend work is needed to flush this
+# out.
 depend type=require fmri=library/python/oslo.middleware-$(PYV)
 
 # force a dependency on oslo.policy; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.policy-$(PYV)
 
-# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
 depend type=require fmri=library/python/oslo.serialization-$(PYV)
 
 # force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
@@ -503,7 +516,7 @@
 depend type=require fmri=library/python/pbr-$(PYV)
 
 # force a dependency on pycadf; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pycadf-$(PYV)@0.8.0,$(BUILD_VERSION)
+depend type=require fmri=library/python/pycadf-$(PYV)
 
 # force a dependency on python-ldap; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/python-ldap-$(PYV)
@@ -521,16 +534,5 @@
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
 
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/stevedore-$(PYV)
-
 # force a dependency on webob; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/webob-$(PYV)
-# force a dependency on the Apache web server
-depend type=require fmri=web/server/apache-24
-
-# force a dependency on the mod_ssl module
-depend type=require fmri=web/server/apache-24/module/apache-ssl
-
-# force a dependency on the mod_wsgi module
-depend type=require fmri=web/server/apache-24/module/apache-wsgi-$(PYV)
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/keystone/patches/requirements.patch
--- a/components/openstack/keystone/patches/requirements.patch	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/keystone/patches/requirements.patch	Thu Feb 11 17:35:00 2016 -0800
@@ -1,38 +1,69 @@
 In-house patch to remove unnecessary dependencies from Keystone's
 requirements files. The specific reasons are as follows:
 
-paste			Not applicable
+iso8601			Not applicable
+
+netaddr			Not applicable
 
-posix_ipc		Not applicable
+Paste			Not applicable
+
+posix-ipc		Not applicable
 
---- keystone-2015.1.2/keystone.egg-info/requires.txt.orig      2015-10-13 13:44:44.730755549 -0600
-+++ keystone-2015.1.2/keystone.egg-info/requires.txt        2015-10-13 13:44:50.161960656 -0600
-@@ -4,7 +4,6 @@ eventlet!=0.17.0,>=0.16.1
+pysaml2			Not applicable to Solaris
+
+--- keystone-2015.1.2/keystone.egg-info/requires.txt.~1~	2015-10-13 10:22:09.000000000 -0700
++++ keystone-2015.1.2/keystone.egg-info/requires.txt	2016-02-02 00:30:30.677285834 -0800
+@@ -2,16 +2,13 @@ pbr!=0.7,<1.0,>=0.6
+ WebOb>=1.2.3
+ eventlet!=0.17.0,>=0.16.1
  greenlet>=0.3.2
- netaddr>=0.7.12
+-netaddr>=0.7.12
  PasteDeploy>=1.5.0
 -Paste
  Routes!=2.0,>=1.12.3
  cryptography>=0.8 # Apache-2.0
  six>=1.9.0
-@@ -29,5 +28,4 @@ pysaml2
+ SQLAlchemy<=0.9.99,>=0.9.7
+ sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
+ passlib
+-iso8601>=0.1.9
+ python-keystoneclient<1.4.0,>=1.2.0
+ keystonemiddleware<1.6.0,>=1.5.0
+ oslo.concurrency<1.9.0,>=1.8.2 # Apache-2.0
+@@ -25,9 +22,7 @@ oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
+ oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+ oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
+ oauthlib>=0.6
+-pysaml2
  dogpile.cache>=0.5.3
  jsonschema<3.0.0,>=2.0.0
  pycadf<0.9.0,>=0.8.0
 -posix-ipc
  msgpack-python>=0.4.0
-
---- keystone-2015.1.2/requirements.txt.orig  2015-10-13 13:43:45.598126189 -0600
-+++ keystone-2015.1.2/requirements.txt    2015-10-13 13:43:57.481207228 -0600
-@@ -8,7 +8,6 @@ eventlet!=0.17.0,>=0.16.1
+--- keystone-2015.1.2/requirements.txt.~1~	2015-10-13 10:18:02.000000000 -0700
++++ keystone-2015.1.2/requirements.txt	2016-02-02 00:30:59.005350937 -0800
+@@ -6,16 +6,13 @@ pbr!=0.7,<1.0,>=0.6
+ WebOb>=1.2.3
+ eventlet!=0.17.0,>=0.16.1
  greenlet>=0.3.2
- netaddr>=0.7.12
+-netaddr>=0.7.12
  PasteDeploy>=1.5.0
 -Paste
  Routes!=2.0,>=1.12.3
  cryptography>=0.8 # Apache-2.0
  six>=1.9.0
-@@ -33,5 +32,4 @@ pysaml2
+ SQLAlchemy<=0.9.99,>=0.9.7
+ sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
+ passlib
+-iso8601>=0.1.9
+ python-keystoneclient<1.4.0,>=1.2.0
+ keystonemiddleware<1.6.0,>=1.5.0
+ oslo.concurrency<1.9.0,>=1.8.2 # Apache-2.0
+@@ -29,9 +26,7 @@ oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
+ oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+ oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
+ oauthlib>=0.6
+-pysaml2
  dogpile.cache>=0.5.3
  jsonschema<3.0.0,>=2.0.0
  pycadf<0.9.0,>=0.8.0
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/swift/Makefile
--- a/components/openstack/swift/Makefile	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/swift/Makefile	Thu Feb 11 17:35:00 2016 -0800
@@ -56,21 +56,22 @@
 PKG_MACROS +=		PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .)
 
 #
-# All of the swift SMF manifests depend on swift-upgrade so copy it
+# All of the swift SMF manifests depend on swift-upgrade so copy them
 # into the proto directory for pkgdepend(1) to find.
 #
 COMPONENT_POST_INSTALL_ACTION += \
-	($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
-	 $(CP) \
-	     files/swift-*.xml \
-	     $(PROTO_DIR)/lib/svc/manifest/application/openstack;)
+    ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+     $(CP) \
+         files/swift-*.xml \
+         $(PROTO_DIR)/lib/svc/manifest/application/openstack)
 
 COMPONENT_TEST_DIR =	$(SOURCE_DIR)
 COMPONENT_TEST_CMD =	nosetests
 COMPONENT_TEST_ENV +=	SWIFT_TEST_CONFIG_FILE=$(SWIFT_TEST_CONFIG_FILE)
-COMPONENT_TEST_ARGS =	--with-xunit \
-			--xunit-file=$(BUILD_DIR)/nosetests-$(MACH).xml
-COMPONENT_TEST_ARGS +=	test/unit
+COMPONENT_TEST_ARGS =	\
+    --with-xunit \
+    --xunit-file=$(BUILD_DIR)/nosetests-$(MACH).xml \
+    test/unit
 
 # common targets
 build:		$(BUILD_NO_ARCH)
@@ -84,8 +85,8 @@
 
 REQUIRED_PACKAGES += cloud/openstack/openstack-common
 REQUIRED_PACKAGES += library/python/eventlet-27
-REQUIRED_PACKAGES += library/python/iniparse-27
 REQUIRED_PACKAGES += library/python/simplejson-27
 REQUIRED_PACKAGES += library/python/swiftclient-27
+REQUIRED_PACKAGES += network/rsync
 REQUIRED_PACKAGES += service/memcached
 REQUIRED_PACKAGES += system/core-os
diff -r 27d201e3362b -r 508add8f43f1 components/openstack/swift/swift.p5m
--- a/components/openstack/swift/swift.p5m	Thu Feb 11 17:34:50 2016 -0800
+++ b/components/openstack/swift/swift.p5m	Thu Feb 11 17:35:00 2016 -0800
@@ -292,9 +292,15 @@
 # To upgrade to Kilo version, Juno version of the package must be on the system
 depend type=origin fmri=cloud/openstack/swift@2.2.2 root-image=true
 
+# force a dependency on package delivering rsync(1)
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/rsync
+
 # force a dependency on dnspython; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/dnspython-$(PYV)
 
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-$(PYV)
+
 # force a dependency on keystonemiddleware; used via a paste.deploy filter
 depend type=require fmri=library/python/keystonemiddleware-$(PYV)
 
@@ -305,11 +311,11 @@
 # out.
 depend type=require fmri=library/python/paste.deploy-$(PYV)
 
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
 # force a dependency on setuptools; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/setuptools-$(PYV)
 
 # force a dependency on xattr; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/xattr-$(PYV)
-
-# force a dependency on rsync; required for replicator service.
-depend type=require fmri=network/rsync