--- a/components/openstack/nova/Makefile Wed Sep 07 14:48:42 2016 -0700
+++ b/components/openstack/nova/Makefile Wed Sep 07 14:48:42 2016 -0700
@@ -26,20 +26,20 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= nova
-COMPONENT_CODENAME= kilo
-COMPONENT_VERSION= 2015.1.2
-COMPONENT_BE_VERSION= 2015.1
+COMPONENT_CODENAME= mitaka
+COMPONENT_VERSION= 13.1.0
+COMPONENT_BE_VERSION= 2016.1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:8ea47c076367dec47d7bea89210f260da64171be5adf559ced8514d5fdb6c453
-COMPONENT_ARCHIVE_URL= http://launchpad.net/$(COMPONENT_NAME)/$(COMPONENT_CODENAME)/$(COMPONENT_VERSION)/+download/$(COMPONENT_ARCHIVE)
+ sha256:2c44b0f015f48348d768abff0e0fc90c6f8faf46743cae94736d77704f249368
+COMPONENT_ARCHIVE_URL= \
+ https://tarballs.openstack.org/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/nova
-IPS_COMPONENT_VERSION= 0.$(COMPONENT_VERSION)
-TPNO= 25792
+TPNO= 30363
PKG_VARS += COMPONENT_BE_VERSION
@@ -63,33 +63,32 @@
# the proto directory for pkgdepend(1) to find.
#
COMPONENT_POST_INSTALL_ACTION += \
- ($(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 \
- files/nova-api-metadata.xml \
- files/nova-api-osapi-compute.xml \
- files/nova-cert.xml \
- files/nova-compute.xml \
- files/nova-conductor.xml \
- files/nova-consoleauth.xml \
- files/nova-novncproxy.xml \
- files/nova-objectstore.xml \
- files/nova-scheduler.xml \
- files/nova-upgrade.xml \
- files/zone-vnc-console.xml \
- $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
- $(CP) \
- files/network/solaris_net.py \
- $(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)$(PYTHON_LIB)/nova/virt/solariszones); \
- $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
+ ($(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 \
+ files/nova-api-metadata.xml \
+ files/nova-api-osapi-compute.xml \
+ files/nova-cert.xml \
+ files/nova-compute.xml \
+ files/nova-conductor.xml \
+ files/nova-consoleauth.xml \
+ files/nova-novncproxy.xml \
+ files/nova-objectstore.xml \
+ files/nova-scheduler.xml \
+ files/nova-upgrade.xml \
+ files/zone-vnc-console.xml \
+ $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+ $(CP) \
+ files/network/solaris_net.py \
+ $(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)$(PYTHON_LIB)/nova/virt/solariszones); \
+ $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
# common targets
build: $(BUILD_NO_ARCH)
@@ -98,7 +97,7 @@
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
REQUIRED_PACKAGES += cloud/openstack/openstack-common
@@ -106,11 +105,12 @@
REQUIRED_PACKAGES += library/python/eventlet-27
REQUIRED_PACKAGES += library/python/iniparse-27
REQUIRED_PACKAGES += library/python/oslo.config-27
+REQUIRED_PACKAGES += library/python/oslo.log-27
+REQUIRED_PACKAGES += library/python/oslo.messaging-27
REQUIRED_PACKAGES += library/python/oslo.serialization-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
REQUIRED_PACKAGES += system/library/storage/suri