--- a/components/openstack/cinder/Makefile Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/cinder/Makefile Fri May 20 17:42:29 2016 -0400
@@ -20,25 +20,25 @@
#
#
-# 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= cinder
-COMPONENT_CODENAME= juno
-COMPONENT_VERSION= 2014.2.2
-COMPONENT_BE_VERSION= 2014.2
+COMPONENT_CODENAME= kilo
+COMPONENT_VERSION= 2015.1.2
+COMPONENT_BE_VERSION= 2015.1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:2c779bf9d208163af6c425da9043bbdcb345cebc5c118198482b94062862a117
+ sha256:8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333
COMPONENT_ARCHIVE_URL= http://launchpad.net/$(COMPONENT_NAME)/$(COMPONENT_CODENAME)/$(COMPONENT_VERSION)/+download/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/cinder
IPS_COMPONENT_VERSION= 0.$(COMPONENT_VERSION)
-TPNO= 21819
+TPNO= 25784
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -54,31 +54,40 @@
PKG_MACROS += PYVER=$(PYTHON_VERSIONS)
PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .)
+COMPONENT_POST_UNPACK_ACTION += \
+ $(MKDIR) $(SOURCE_DIR)/cinder/volume/drivers/zfssa; \
+ $(CP) files/zfssa/zfssaiscsi.py \
+ $(SOURCE_DIR)/cinder/volume/drivers/zfssa
+
#
# cinder-api, cinder-backup, cinder-scrubber, and cinder-volume depend
# on cinder-db, and cinder-upgrade so copy all of the service
# manifests into the proto directory for pkgdepend(1) to find.
#
COMPONENT_POST_INSTALL_ACTION += \
- ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
- $(CP) \
- files/cinder-api.xml \
- files/cinder-backup.xml \
- files/cinder-db.xml \
- files/cinder-scheduler.xml \
- files/cinder-upgrade.xml \
- files/cinder-volume.xml \
- $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
- $(CP) \
- files/solaris/solarisfc.py \
- files/solaris/solarisiscsi.py \
- $(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)
+ ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+ $(CP) \
+ files/cinder-api.xml \
+ files/cinder-backup.xml \
+ files/cinder-db.xml \
+ files/cinder-scheduler.xml \
+ files/cinder-upgrade.xml \
+ files/cinder-volume.xml \
+ $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+ $(CP) \
+ files/solaris/solarisfc.py \
+ files/solaris/solarisiscsi.py \
+ $(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/nfs.py \
+ files/solaris/zfs.py \
+ $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/solaris; \
+ $(CP) files/zfssa/cinder.akwf \
+ $(PROTO_DIR)$(PYTHON_LIB)/cinder/volume/drivers/zfssa); \
+ $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
# common targets
build: $(BUILD_NO_ARCH)
@@ -89,11 +98,12 @@
REQUIRED_PACKAGES += cloud/openstack/openstack-common
+REQUIRED_PACKAGES += file/gnu-coreutils
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/oslo.utils-27
REQUIRED_PACKAGES += library/python/sqlalchemy-27
REQUIRED_PACKAGES += library/python/sqlalchemy-migrate-27
REQUIRED_PACKAGES += system/core-os