--- a/components/openstack/cinder/cinder.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/cinder/cinder.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -42,7 +42,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/054 \
- value=PSARC/2014/208 value=PSARC/2015/110 value=PSARC/2015/535
+ value=PSARC/2014/208 value=PSARC/2015/110 value=PSARC/2015/289 \
+ value=PSARC/2015/535 value=PSARC/2016/014
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set name=variant.opensolaris.zone value=global value=nonglobal
#
--- a/components/openstack/common/openstack-common.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/common/openstack-common.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -37,7 +37,7 @@
set name=info.upstream value="OpenStack <[email protected]>"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2015/110 \
- value=PSARC/2015/233 value=PSARC/2015/535
+ value=PSARC/2015/233 value=PSARC/2015/535 value=PSARC/2016/251
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
file path=usr/lib/python$(PYVER)/vendor-packages/openstack_common.py
--- a/components/openstack/common/openstack.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/common/openstack.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -68,4 +68,4 @@
depend type=group fmri=system/management/rad/module/rad-evs-controller
# To upgrade to Kilo version, Juno version of the package must be on the system
-depend type=origin fmri=pkg:/cloud/[email protected] root-image=true
+depend type=origin fmri=cloud/[email protected] root-image=true
--- a/components/openstack/neutron/neutron.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/neutron/neutron.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -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/059 \
- value=PSARC/2015/110 value=PSARC/2015/535 value=PSARC/2016/116
+ value=PSARC/2015/110 value=PSARC/2015/535 value=PSARC/2016/116 \
+ value=PSARC/2016/251
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
dir path=etc/neutron owner=neutron group=neutron mode=0700
--- a/components/openstack/nova/nova.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/openstack/nova/nova.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -42,7 +42,8 @@
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/049 \
value=PSARC/2014/210 value=PSARC/2015/110 value=PSARC/2015/324 \
- value=PSARC/2015/357 value=PSARC/2015/535
+ value=PSARC/2015/357 value=PSARC/2015/535 value=PSARC/2016/031 \
+ value=PSARC/2016/172 value=PSARC/2016/242 value=PSARC/2016/251
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
dir path=etc/nova owner=nova group=nova mode=0700
#
--- a/components/python/oslo.vmware/oslo.vmware-PYVER.p5m Mon Jun 13 23:38:24 2016 -0700
+++ b/components/python/oslo.vmware/oslo.vmware-PYVER.p5m Mon Jun 13 23:38:24 2016 -0700
@@ -37,7 +37,7 @@
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream value="OpenStack <[email protected]>"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2014/058
+set name=org.opensolaris.arc-caseid value=PSARC/2015/058
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
file path=usr/lib/python$(PYVER)/vendor-packages/oslo.vmware-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth