--- a/components/openstack/keystone/Makefile Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/keystone/Makefile Fri May 20 17:42:29 2016 -0400
@@ -20,25 +20,25 @@
#
#
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= keystone
-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:5674c1ae0aa7203cca0aba634e939bcfb7e1e0f60f62a6d6fceeb05efb84980e
+ sha256:af63a89ca1cebfff593e35c24105c1442ab50f760871d756a48cfc120a7a8ddb
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/keystone
IPS_COMPONENT_VERSION= 0.$(COMPONENT_VERSION)
-TPNO= 21823
+TPNO= 25790
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -59,11 +59,15 @@
# manifests into the proto directory for pkgdepend(1) to find.
#
COMPONENT_POST_INSTALL_ACTION += \
- ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
- $(CP) \
- files/keystone.xml \
- files/keystone-upgrade.xml \
- $(PROTO_DIR)/lib/svc/manifest/application/openstack;)
+ ($(MKDIR) $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+ $(CP) \
+ files/keystone.xml \
+ files/keystone-upgrade.xml \
+ $(PROTO_DIR)/lib/svc/manifest/application/openstack; \
+ $(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/keystone/httpd; \
+ $(CP) $(SOURCE_DIR)/httpd/keystone.py \
+ $(PROTO_DIR)$(PYTHON_LIB)/keystone/httpd); \
+ $(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES)
# common targets
build: $(BUILD_NO_ARCH)
@@ -75,10 +79,10 @@
REQUIRED_PACKAGES += cloud/openstack/openstack-common
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
+REQUIRED_PACKAGES += web/server/apache-24
+REQUIRED_PACKAGES += web/server/apache-24/module/apache-ssl
+REQUIRED_PACKAGES += web/server/apache-24/module/apache-wsgi-27