--- a/components/openstack/cinder/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -49,7 +49,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -73,12 +73,12 @@
$(CP) \
files/solaris/solarisfc.py \
files/solaris/solarisiscsi.py \
- $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/brick/initiator; \
- $(MKDIR) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/solaris; \
- $(TOUCH) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/solaris/__init__.py; \
- $(CP) files/solaris/zfs.py $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/solaris; \
- $(MKDIR) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/zfssa; \
- $(CP) files/zfssa/cinder.akwf $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/cinder/volume/drivers/zfssa); \
+ $(PROTO_DIR)$(PYTHON_LIB)/cinder/brick/initiator; \
+ $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris; \
+ $(TOUCH) $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris/__init__.py; \
+ $(CP) files/solaris/zfs.py $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris; \
+ $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/zfssa; \
+ $(CP) files/zfssa/cinder.akwf $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/zfssa); \
$(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
# common targets
@@ -89,13 +89,13 @@
test: $(NO_TESTS)
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/ipython-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26
+REQUIRED_PACKAGES += library/python/eventlet-27
+REQUIRED_PACKAGES += library/python/iniparse-27
+REQUIRED_PACKAGES += library/python/ipython-27
+REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/python-mysql-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/file-system/zfs
REQUIRED_PACKAGES += system/storage/fc-utilities
--- a/components/openstack/cinder/cinder.p5m Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/cinder.p5m Fri Apr 03 10:46:51 2015 -0600
@@ -557,9 +557,6 @@
# force a dependency on package delivering zfs(1M)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zfs
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
--- a/components/openstack/cinder/files/cinder-api Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/files/cinder-api Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/cinder/files/cinder-backup Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/files/cinder-backup Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/cinder/files/cinder-scheduler Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/files/cinder-scheduler Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/cinder/files/cinder-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/files/cinder-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/cinder/files/cinder-volume Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/files/cinder-volume Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/cinder/files/cinder-volume-setup Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/cinder/files/cinder-volume-setup Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/glance/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/glance/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -49,7 +49,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -78,11 +78,11 @@
test: $(NO_TESTS)
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/m2crypto-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26
+REQUIRED_PACKAGES += library/python/eventlet-27
+REQUIRED_PACKAGES += library/python/iniparse-27
+REQUIRED_PACKAGES += library/python/m2crypto-27
+REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/python-mysql-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27
REQUIRED_PACKAGES += system/core-os
--- a/components/openstack/glance/files/glance-api Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/glance/files/glance-api Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/glance/files/glance-registry Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/glance/files/glance-registry Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/glance/files/glance-scrubber Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/glance/files/glance-scrubber Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/glance/files/glance-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/glance/files/glance-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/glance/glance.p5m Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/glance/glance.p5m Fri Apr 03 10:46:51 2015 -0600
@@ -389,9 +389,6 @@
# to flush this out.
depend type=group fmri=library/python/simplejson-$(PYV)
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
@@ -417,9 +414,6 @@
# 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 ordereddict; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/ordereddict-$(PYV)
-
# force a dependency on oslo.db; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.db-$(PYV)
--- a/components/openstack/heat/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/heat/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -49,7 +49,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -82,13 +82,13 @@
test: $(NO_TESTS)
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/setuptools-26
-REQUIRED_PACKAGES += library/python/six-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26
+REQUIRED_PACKAGES += library/python/eventlet-27
+REQUIRED_PACKAGES += library/python/iniparse-27
+REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/python-mysql-27
+REQUIRED_PACKAGES += library/python/setuptools-27
+REQUIRED_PACKAGES += library/python/six-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27
REQUIRED_PACKAGES += shell/bash
REQUIRED_PACKAGES += system/core-os
--- a/components/openstack/heat/files/heat-smf-method Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/heat/files/heat-smf-method Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/heat/files/heat-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/heat/files/heat-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/heat/heat.p5m Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/heat/heat.p5m Fri Apr 03 10:46:51 2015 -0600
@@ -368,9 +368,6 @@
# to flush this out.
depend type=group fmri=library/python/simplejson-$(PYV)
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
--- a/components/openstack/horizon/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/horizon/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -210,11 +210,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
-
-# Django's manage.py needs to be run with Python 2.6, since that's what this
-# ecosystem runs under right now.
-PYTHON_VERSION= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -306,23 +302,23 @@
# Packages required by Django's manage.py during the Horizon build
-REQUIRED_PACKAGES += library/python/babel-26
-REQUIRED_PACKAGES += library/python/ceilometerclient-26
-REQUIRED_PACKAGES += library/python/cinderclient-26
-REQUIRED_PACKAGES += library/python/django-26
-REQUIRED_PACKAGES += library/python/django-pyscss-26
-REQUIRED_PACKAGES += library/python/django_compressor-26
-REQUIRED_PACKAGES += library/python/django_openstack_auth-26
-REQUIRED_PACKAGES += library/python/glanceclient-26
-REQUIRED_PACKAGES += library/python/heatclient-26
-REQUIRED_PACKAGES += library/python/iso8601-26
-REQUIRED_PACKAGES += library/python/keystoneclient-26
-REQUIRED_PACKAGES += library/python/lockfile-26
-REQUIRED_PACKAGES += library/python/neutronclient-26
-REQUIRED_PACKAGES += library/python/novaclient-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/requests-26
-REQUIRED_PACKAGES += library/python/saharaclient-26
-REQUIRED_PACKAGES += library/python/six-26
-REQUIRED_PACKAGES += library/python/swiftclient-26
-REQUIRED_PACKAGES += library/python/troveclient-26
+REQUIRED_PACKAGES += library/python/babel-27
+REQUIRED_PACKAGES += library/python/ceilometerclient-27
+REQUIRED_PACKAGES += library/python/cinderclient-27
+REQUIRED_PACKAGES += library/python/django-27
+REQUIRED_PACKAGES += library/python/django-pyscss-27
+REQUIRED_PACKAGES += library/python/django_compressor-27
+REQUIRED_PACKAGES += library/python/django_openstack_auth-27
+REQUIRED_PACKAGES += library/python/glanceclient-27
+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/neutronclient-27
+REQUIRED_PACKAGES += library/python/novaclient-27
+REQUIRED_PACKAGES += library/python/oslo.config-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
--- a/components/openstack/horizon/files/local_settings.py Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/horizon/files/local_settings.py Fri Apr 03 10:46:51 2015 -0600
@@ -32,11 +32,11 @@
LOGOUT_URL = '/horizon/auth/logout/'
LOGIN_REDIRECT_URL = '/horizon'
-STATIC_ROOT = '/usr/lib/python2.6/vendor-packages/openstack_dashboard/static'
+STATIC_ROOT = '/usr/lib/python2.7/vendor-packages/openstack_dashboard/static'
# Enable Solaris theme
TEMPLATE_DIRS = (
- '/usr/lib/python2.6/vendor-packages/openstack_dashboard/templates/solaris',
+ '/usr/lib/python2.7/vendor-packages/openstack_dashboard/templates/solaris',
)
# Application files are compressed during packaging
--- a/components/openstack/horizon/files/openstack-dashboard-http.conf Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/horizon/files/openstack-dashboard-http.conf Fri Apr 03 10:46:51 2015 -0600
@@ -1,25 +1,25 @@
-LoadModule wsgi_module libexec/mod_wsgi-2.6.so
+LoadModule wsgi_module libexec/mod_wsgi-2.7.so
<VirtualHost *:80>
WSGIScriptAlias /horizon \
- /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi/django.wsgi
+ /usr/lib/python2.7/vendor-packages/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=webservd group=webservd processes=3 \
threads=10
- Alias /static /usr/lib/python2.6/vendor-packages/openstack_dashboard/static/
+ Alias /static /usr/lib/python2.7/vendor-packages/openstack_dashboard/static/
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
- <Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/static>
+ <Directory /usr/lib/python2.7/vendor-packages/openstack_dashboard/static>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Require all granted
</Directory>
- <Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi>
+ <Directory /usr/lib/python2.7/vendor-packages/openstack_dashboard/wsgi>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Require all granted
--- a/components/openstack/horizon/files/openstack-dashboard-tls.conf Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/horizon/files/openstack-dashboard-tls.conf Fri Apr 03 10:46:51 2015 -0600
@@ -1,5 +1,5 @@
LoadModule ssl_module libexec/mod_ssl.so
-LoadModule wsgi_module libexec/mod_wsgi-2.6.so
+LoadModule wsgi_module libexec/mod_wsgi-2.7.so
#
# Enable Solaris Cryptographic Framework
@@ -32,24 +32,24 @@
SSLCertificateKeyFile /path/to/Server_PEM-encoded_Private_Key_file
WSGIScriptAlias /horizon \
- /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi/django.wsgi
+ /usr/lib/python2.7/vendor-packages/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=webservd group=webservd processes=3 \
threads=10
- Alias /static /usr/lib/python2.6/vendor-packages/openstack_dashboard/static/
+ Alias /static /usr/lib/python2.7/vendor-packages/openstack_dashboard/static/
<Directory />
Options FollowSymLinks
AllowOverride None
</Directory>
- <Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/static>
+ <Directory /usr/lib/python2.7/vendor-packages/openstack_dashboard/static>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Require all granted
</Directory>
- <Directory /usr/lib/python2.6/vendor-packages/openstack_dashboard/wsgi>
+ <Directory /usr/lib/python2.7/vendor-packages/openstack_dashboard/wsgi>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Require all granted
--- a/components/openstack/horizon/patches/99-remove.xstatic.patch Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/horizon/patches/99-remove.xstatic.patch Fri Apr 03 10:46:51 2015 -0600
@@ -6,8 +6,8 @@
than during gmake prep. We need the xstatic functionality to collect
all the JavaScript libraries before packaging.
---- a/usr/lib/python2.6/vendor-packages/openstack_dashboard/settings.py 2015-01-13 10:40:30.930622964 -0700
-+++ b/usr/lib/python2.6/vendor-packages/openstack_dashboard/settings.py 2015-01-13 10:40:57.470743881 -0700
+--- a/usr/lib/python2.7/vendor-packages/openstack_dashboard/settings.py 2015-01-13 10:40:30.930622964 -0700
++++ b/usr/lib/python2.7/vendor-packages/openstack_dashboard/settings.py 2015-01-13 10:40:57.470743881 -0700
@@ -22,21 +22,6 @@ import sys
import warnings
--- a/components/openstack/keystone/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/keystone/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -49,7 +49,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -74,11 +74,11 @@
test: $(NO_TESTS)
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/pbr-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26
+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
--- a/components/openstack/keystone/files/keystone Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/keystone/files/keystone Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/keystone/files/keystone-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/keystone/files/keystone-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/keystone/keystone.p5m Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/keystone/keystone.p5m Fri Apr 03 10:46:51 2015 -0600
@@ -395,9 +395,6 @@
# force a dependency on package delivering openssl(1OPENSSL)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/openssl
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
--- a/components/openstack/neutron/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -49,7 +49,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -97,15 +97,15 @@
test: $(NO_TESTS)
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/netaddr-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/oslo.db-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/simplejson-26
-REQUIRED_PACKAGES += library/python/six-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
+REQUIRED_PACKAGES += library/python/eventlet-27
+REQUIRED_PACKAGES += library/python/iniparse-27
+REQUIRED_PACKAGES += library/python/netaddr-27
+REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/oslo.db-27
+REQUIRED_PACKAGES += library/python/python-mysql-27
+REQUIRED_PACKAGES += library/python/simplejson-27
+REQUIRED_PACKAGES += library/python/six-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-27
REQUIRED_PACKAGES += network/ipfilter
REQUIRED_PACKAGES += service/network/dnsmasq
REQUIRED_PACKAGES += service/network/evs
--- a/components/openstack/neutron/files/evs/migrate/evs-neutron-migration.py Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/files/evs/migrate/evs-neutron-migration.py Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/neutron/files/neutron-dhcp-agent Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/files/neutron-dhcp-agent Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/neutron/files/neutron-l3-agent Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/files/neutron-l3-agent Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/neutron/files/neutron-metadata-agent Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/files/neutron-metadata-agent Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/neutron/files/neutron-server Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/files/neutron-server Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/neutron/files/neutron-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/files/neutron-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/neutron/neutron.p5m Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/neutron/neutron.p5m Fri Apr 03 10:46:51 2015 -0600
@@ -1009,9 +1009,6 @@
# force a dependency on alembic; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/alembic-$(PYV)
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
--- a/components/openstack/nova/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -49,7 +49,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -62,7 +62,7 @@
# the proto directory for pkgdepend(1) to find.
#
COMPONENT_POST_INSTALL_ACTION += \
- ($(CP) /dev/null $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/virt/libvirt/__init__.py; \
+ ($(CP) /dev/null $(PROTO_DIR)$(PYTHON_LIB)/nova/virt/libvirt/__init__.py; \
$(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
$(CP) \
files/nova-api-ec2.xml \
@@ -80,13 +80,13 @@
$(PROTO_DIR)/lib/svc/manifest/application/openstack; \
$(CP) \
files/network/solaris_net.py \
- $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/network; \
- $(MKDIR) $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/virt/solariszones; \
+ $(PROTO_DIR)$(PYTHON_LIB)/nova/network; \
+ $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/nova/virt/solariszones; \
$(CP) \
files/solariszones/__init__.py \
files/solariszones/driver.py \
files/solariszones/sysconfig.py \
- $(PROTO_DIR)/usr/lib/python2.6/vendor-packages/nova/virt/solariszones); \
+ $(PROTO_DIR)$(PYTHON_LIB)/nova/virt/solariszones); \
$(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
# common targets
@@ -98,13 +98,13 @@
REQUIRED_PACKAGES += install/archive
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/oslo.config-26
-REQUIRED_PACKAGES += library/python/python-mysql-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-26
-REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-26
-REQUIRED_PACKAGES += library/python/webob-26
+REQUIRED_PACKAGES += library/python/eventlet-27
+REQUIRED_PACKAGES += library/python/iniparse-27
+REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/python-mysql-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-27
+REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27
+REQUIRED_PACKAGES += library/python/webob-27
REQUIRED_PACKAGES += service/network/evs
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/file-system/zfs
--- a/components/openstack/nova/files/nova-api Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-api Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-cert Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-cert Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-compute Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-compute Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-conductor Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-conductor Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-consoleauth Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-consoleauth Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-novncproxy Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-novncproxy Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-objectstore Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-objectstore Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-scheduler Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-scheduler Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/nova/files/nova-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/nova/files/nova.conf Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/nova.conf Fri Apr 03 10:46:51 2015 -0600
@@ -284,7 +284,7 @@
# Directory where the nova python module is installed (string
# value)
-pybasedir=/usr/lib/python2.6/vendor-packages
+pybasedir=/usr/lib/python2.7/vendor-packages
# Directory where nova binaries are installed (string value)
bindir=/usr/bin
--- a/components/openstack/nova/files/zone-vnc-console Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/files/zone-vnc-console Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
--- a/components/openstack/nova/nova.p5m Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/nova/nova.p5m Fri Apr 03 10:46:51 2015 -0600
@@ -918,9 +918,6 @@
depend type=require fmri=__TBD \
pkg.debug.depend.file=usr/share/novnc/vnc_auto.html
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on babel; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/babel-$(PYV)
--- a/components/openstack/swift/Makefile Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/swift/Makefile Fri Apr 03 10:46:51 2015 -0600
@@ -48,7 +48,7 @@
# Since this is an app, and doesn't provide any public library interfaces, we
# only need to deliver one version. The manifest is parameterized, though.
-PYTHON_VERSIONS= 2.6
+PYTHON_VERSIONS= 2.7
PKG_MACROS += COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
@@ -79,9 +79,9 @@
test: $(TEST_NO_ARCH)
-REQUIRED_PACKAGES += library/python/eventlet-26
-REQUIRED_PACKAGES += library/python/iniparse-26
-REQUIRED_PACKAGES += library/python/simplejson-26
-REQUIRED_PACKAGES += library/python/swiftclient-26
+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 += service/memcached
REQUIRED_PACKAGES += system/core-os
--- a/components/openstack/swift/files/swift-replicator-rsync Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/swift/files/swift-replicator-rsync Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/swift/files/swift-smf-method Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/swift/files/swift-smf-method Fri Apr 03 10:46:51 2015 -0600
@@ -1,6 +1,6 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
--- a/components/openstack/swift/files/swift-upgrade Fri Apr 03 05:45:05 2015 -0700
+++ b/components/openstack/swift/files/swift-upgrade Fri Apr 03 10:46:51 2015 -0600
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#