PSARC 2016/455 OpenStack service updates for Mitaka
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:47:15 -0700
changeset 6858 0f8601e37dad
parent 6857 4cbe0ba20818
child 6859 569bef81e3c4
PSARC 2016/455 OpenStack service updates for Mitaka 24488026 Update OpenStack to the Mitaka release (umbrella)
components/openstack/common/Makefile
components/openstack/common/files/openstack_common.py
components/openstack/common/openstack-common.p5m
components/openstack/common/openstack.p5m
components/python/cryptography/cryptography-PYVER.p5m
components/python/cryptography/patches/01-deprecation-fix.patch
components/python/quantumclient/Makefile
components/python/quantumclient/patches/requirements.patch
transforms/python-3-groups
transforms/standard-python-libraries
--- a/components/openstack/common/Makefile	Wed Sep 07 14:48:43 2016 -0700
+++ b/components/openstack/common/Makefile	Wed Sep 07 14:47:15 2016 -0700
@@ -26,11 +26,11 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openstack
-COMPONENT_VERSION=	2015.1.2
+COMPONENT_VERSION=	2016.1.1
 COMPONENT_SRC=
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
 COMPONENT_BUGDB=	service/nova
-IPS_COMPONENT_VERSION=	0.$(COMPONENT_VERSION)
+IPS_COMPONENT_VERSION=	0.2016.1
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
--- a/components/openstack/common/files/openstack_common.py	Wed Sep 07 14:48:43 2016 -0700
+++ b/components/openstack/common/files/openstack_common.py	Wed Sep 07 14:47:15 2016 -0700
@@ -120,6 +120,9 @@
     section/key.
     """
 
+    if not os.path.exists(old_file):
+        return
+
     new_file = old_file + '.new'
 
     # open the previous version
@@ -282,16 +285,6 @@
     return results
 
 
-def is_ml2_plugin():
-    parser = iniparse.ConfigParser()
-    parser.readfp(open("/etc/neutron/neutron.conf"))
-    try:
-        core_plugin = parser.get("DEFAULT", "core_plugin")
-    except NoOptionError:
-        return False
-    return "ml2" in core_plugin.lower()
-
-
 def kill_contract(attempts, interval, ctid):
     """ Keeps issuing SIGTERM to contract-id at specified intervals until
     either the contract is empty or the specified number of attempts are made.
--- a/components/openstack/common/openstack-common.p5m	Wed Sep 07 14:48:43 2016 -0700
+++ b/components/openstack/common/openstack-common.p5m	Wed Sep 07 14:47:15 2016 -0700
@@ -28,7 +28,7 @@
 set name=pkg.summary value="OpenStack Common Package"
 set name=pkg.description \
     value="Library package for common data structures and functions used by other OpenStack projects within Solaris."
-set name=pkg.human-version value="Kilo $(COMPONENT_VERSION)"
+set name=pkg.human-version value="Mitaka $(COMPONENT_VERSION)"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration" \
     value="org.opensolaris.category.2008:System/Enterprise Management" \
@@ -37,7 +37,8 @@
 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/2016/251
+    value=PSARC/2015/233 value=PSARC/2015/535 value=PSARC/2016/251 \
+    value=PSARC/2016/268 value=PSARC/2016/455
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 file path=usr/lib/python$(PYVER)/vendor-packages/openstack_common.py
--- a/components/openstack/common/openstack.p5m	Wed Sep 07 14:48:43 2016 -0700
+++ b/components/openstack/common/openstack.p5m	Wed Sep 07 14:47:15 2016 -0700
@@ -28,7 +28,7 @@
 set name=pkg.summary value=OpenStack
 set name=pkg.description \
     value="OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a data center, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface."
-set name=pkg.human-version value="Kilo $(COMPONENT_VERSION)"
+set name=pkg.human-version value="Mitaka $(COMPONENT_VERSION)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Meta Packages/Group Packages" \
     value="org.opensolaris.category.2008:System/Administration and Configuration" \
@@ -67,5 +67,6 @@
 depend type=group fmri=network/amqp/rabbitmq
 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=cloud/[email protected] root-image=true
+# To upgrade to the Mitaka version, the Kilo version of the package
+# must be on the system
+depend type=origin fmri=cloud/[email protected] root-image=true
--- a/components/python/cryptography/cryptography-PYVER.p5m	Wed Sep 07 14:48:43 2016 -0700
+++ b/components/python/cryptography/cryptography-PYVER.p5m	Wed Sep 07 14:47:15 2016 -0700
@@ -125,10 +125,6 @@
 # Dependencies on cffi must be incorporated.
 depend type=incorporate fmri=library/python/cffi-$(PYV)@1.5.2
 
-# force a dependency on the Python runtime
-depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
-    pkg.debug.depend.path=usr/bin
-
 # force a dependency on cffi; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/cffi-$(PYV)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cryptography/patches/01-deprecation-fix.patch	Wed Sep 07 14:47:15 2016 -0700
@@ -0,0 +1,47 @@
+Upstream patch that addresses
+
+	https://github.com/pyca/cryptography/issues/2710
+
+which is already fixed in cryptography 1.3 and above.
+
+commit 0639db99c916e61ac8ee2687c4a9d37c7c67ba76
+Author: Alex Gaynor <[email protected]>
+Date:   Sat Feb 6 13:39:16 2016 -0500
+
+    Fixes #2710 -- silence a deprecation warning.
+    
+    Use the new name and alias to the old one
+
+diff --git a/src/cryptography/x509/__init__.py b/src/cryptography/x509/__init__.py
+index a1deb7f..787f1a6 100644
+--- a/src/cryptography/x509/__init__.py
++++ b/src/cryptography/x509/__init__.py
[email protected]@ -4,6 +4,7 @@
+ 
+ from __future__ import absolute_import, division, print_function
+ 
++from cryptography import utils
+ from cryptography.x509.base import (
+     Certificate, CertificateBuilder, CertificateRevocationList,
+     CertificateRevocationListBuilder,
[email protected]@ -30,12 +31,19 @@ from cryptography.x509.general_name import (
+ )
+ from cryptography.x509.name import Name, NameAttribute
+ from cryptography.x509.oid import (
+-    AuthorityInformationAccessOID, CRLEntryExtensionOID, CRLExtensionOID,
++    AuthorityInformationAccessOID, CRLEntryExtensionOID,
+     CertificatePoliciesOID, ExtendedKeyUsageOID, ExtensionOID, NameOID,
+     ObjectIdentifier, SignatureAlgorithmOID, _SIG_OIDS_TO_HASH
+ )
+ 
+ 
++CRLExtensionOID = utils.deprecated(
++    CRLEntryExtensionOID,
++    __name__,
++    "CRLExtensionOID has been renamed to CRLEntryExtensionOID",
++    utils.DeprecatedIn12
++)
++
+ OID_AUTHORITY_INFORMATION_ACCESS = ExtensionOID.AUTHORITY_INFORMATION_ACCESS
+ OID_AUTHORITY_KEY_IDENTIFIER = ExtensionOID.AUTHORITY_KEY_IDENTIFIER
+ OID_BASIC_CONSTRAINTS = ExtensionOID.BASIC_CONSTRAINTS
--- a/components/python/quantumclient/Makefile	Wed Sep 07 14:48:43 2016 -0700
+++ b/components/python/quantumclient/Makefile	Wed Sep 07 14:47:15 2016 -0700
@@ -20,8 +20,9 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		python-quantumclient
@@ -46,7 +47,7 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f quantum quantum-$(PYTHON_VERSION))
+    (cd $(PROTO_DIR)/usr/bin ; $(MV) -f quantum quantum-$(PYTHON_VERSION))
 
 # common targets
 build:		$(BUILD_NO_ARCH)
@@ -55,10 +56,9 @@
 
 #
 # Tests require:
-# hacking, discover, fixtures, python-subunit, sphinx, testrepository, testtools
+# hacking, discover, python-subunit, sphinx, testrepository
 # which haven't been integrated yet.
 #
 test:		$(NO_TESTS)
 
-system-test:    $(NO_TESTS)
-
+system-test:	$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/quantumclient/patches/requirements.patch	Wed Sep 07 14:47:15 2016 -0700
@@ -0,0 +1,20 @@
+This patch updates the version requirement for "pbr" to allow using
+the newer version we have in the Userland gate.
+Without this patch setuptools tries to download an older version of
+pbr and if it can't the build fails.
+
+--- python-quantumclient-2.2.4.3/requirements.txt.~1~	2013-10-01 21:13:30.000000000 -0800
++++ python-quantumclient-2.2.4.3/requirements.txt	2016-08-03 12:38:05.805906059 -0800
[email protected]@ -1,2 +1,2 @@
+-pbr>=0.5.21,<1.0
++pbr>=0.5.21
+ python-neutronclient>=2.3.0,<3
+--- python-quantumclient-2.2.4.3/setup.py.~1~	2016-08-03 12:39:44.871540311 -0800
++++ python-quantumclient-2.2.4.3/setup.py	2016-08-03 12:39:52.772238582 -0800
[email protected]@ -19,5 +19,5 @@
+ import setuptools
+ 
+ setuptools.setup(
+-    setup_requires=['pbr>=0.5.21,<1.0'],
++    setup_requires=['pbr>=0.5.21'],
+     pbr=True)
--- a/transforms/python-3-groups	Wed Sep 07 14:48:43 2016 -0700
+++ b/transforms/python-3-groups	Wed Sep 07 14:47:15 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # We have various group dependencies between Python modules to express the
@@ -29,23 +29,16 @@
 # is not Python 3 ready even though A is.  These group dependencies would
 # prevent A-34 from being installed because B-34 does not exist.  So drop
 # such group dependencies.
-
 <transform depend fmri=library/python/boto-34 type=group -> drop>
-<transform depend fmri=library/python/coverage-34 type=group -> drop>
 <transform depend fmri=library/python/django-34 type=group -> drop>
-<transform depend fmri=library/python/futures-34 type=group -> drop>
 <transform depend fmri=library/python/keystoneclient-34 type=group -> drop>
 <transform depend fmri=library/python/librabbitmq-34 type=group -> drop>
 <transform depend fmri=library/python/m2crypto-34 type=group -> drop>
-<transform depend fmri=library/python/paste-34 type=group -> drop>
 <transform depend fmri=library/python/python-imaging-34 type=group -> drop>
 
 <transform depend fmri=library/python/boto-35 type=group -> drop>
-<transform depend fmri=library/python/coverage-35 type=group -> drop>
 <transform depend fmri=library/python/django-35 type=group -> drop>
-<transform depend fmri=library/python/futures-35 type=group -> drop>
 <transform depend fmri=library/python/keystoneclient-35 type=group -> drop>
 <transform depend fmri=library/python/librabbitmq-35 type=group -> drop>
 <transform depend fmri=library/python/m2crypto-35 type=group -> drop>
-<transform depend fmri=library/python/paste-35 type=group -> drop>
 <transform depend fmri=library/python/python-imaging-35 type=group -> drop>
--- a/transforms/standard-python-libraries	Wed Sep 07 14:48:43 2016 -0700
+++ b/transforms/standard-python-libraries	Wed Sep 07 14:47:15 2016 -0700
@@ -30,8 +30,12 @@
 <transform depend fmri=library/python/argparse-27 -> drop>
 <transform depend fmri=library/python/argparse-34 -> drop>
 <transform depend fmri=library/python/argparse-35 -> drop>
+<transform depend fmri=library/python/contextlib2-34 -> drop>
+<transform depend fmri=library/python/contextlib2-35 -> drop>
 <transform depend fmri=library/python/enum-34 -> drop>
 <transform depend fmri=library/python/enum-35 -> drop>
+<transform depend fmri=library/python/funcsigs-34 -> drop>
+<transform depend fmri=library/python/funcsigs-35 -> drop>
 <transform depend fmri=library/python/futures-34 -> drop>
 <transform depend fmri=library/python/futures-35 -> drop>
 <transform depend fmri=library/python/importlib-27 -> drop>
@@ -39,9 +43,15 @@
 <transform depend fmri=library/python/importlib-35 -> drop>
 <transform depend fmri=library/python/ipaddress-34 -> drop>
 <transform depend fmri=library/python/ipaddress-35 -> drop>
+<transform depend fmri=library/python/mock-34 -> drop>
+<transform depend fmri=library/python/mock-35 -> drop>
+<transform depend fmri=library/python/monotonic-34 -> drop>
+<transform depend fmri=library/python/monotonic-35 -> drop>
 <transform depend fmri=library/python/ordereddict-27 -> drop>
 <transform depend fmri=library/python/ordereddict-34 -> drop>
 <transform depend fmri=library/python/ordereddict-35 -> drop>
+<transform depend fmri=library/python/pathlib-34 -> drop>
+<transform depend fmri=library/python/pathlib-35 -> drop>
 <transform depend fmri=library/python/singledispatch-34 -> drop>
 <transform depend fmri=library/python/singledispatch-35 -> drop>
 <transform depend fmri=library/python/unittest2-27 -> drop>