--- a/components/openstack/cinder/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/cinder/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -45,6 +45,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/common/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/common/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -33,6 +33,9 @@
IPS_COMPONENT_VERSION= 0.2016.1
include $(WS_MAKE_RULES)/prep.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
@@ -44,12 +47,16 @@
PKG_MACROS += PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .)
build: FRC
+ifneq ($(BUILD_TYPE), evaluation)
@/bin/true
+endif
install: FRC
+ifneq ($(BUILD_TYPE), evaluation)
($(MKDIR) $(PROTO_DIR)$(PYTHON_LIB); \
$(CP) files/openstack_common.py $(PROTO_DIR)$(PYTHON_LIB); \
$(PYTHON) -m compileall $(PROTO_DIR)/$(PYTHON_VENDOR_PACKAGES))
+endif
download::
@echo 'No downloads for this component'
--- a/components/openstack/glance/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/glance/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -44,6 +44,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/heat/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/heat/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -44,6 +44,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/horizon/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/horizon/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -298,15 +298,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
-
-# Odd django failures on S11; OpenStack is back-ported to 11.3 anyway, so no
-# need to include it in evaluation builds.
-ifeq ($(BUILD_TYPE), evaluation)
-BUILD_NO_ARCH=
-INSTALL_NO_ARCH=
-PUBLISH_STAMP=
-endif
-
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/ironic/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/ironic/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -45,6 +45,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/keystone/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/keystone/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -45,6 +45,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/neutron/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/neutron/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -63,6 +63,7 @@
include $(WS_MAKE_RULES)/setup.py.mk
# Depends on openvswitch, available in S12 but not 11.3, so do not publish.
+BUILD_BITS=NO_ARCH
include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
--- a/components/openstack/nova/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/nova/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -45,6 +45,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/openstack/swift/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/openstack/swift/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -44,6 +44,9 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
+# OpenStack Mitaka requires OVS and RAD changes not present in 11.3
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
--- a/components/ruby/puppet-modules/openstack-cinder/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-cinder/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = cinder
--- a/components/ruby/puppet-modules/openstack-glance/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-glance/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = glance
--- a/components/ruby/puppet-modules/openstack-heat/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-heat/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = heat
--- a/components/ruby/puppet-modules/openstack-horizon/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-horizon/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = horizon
--- a/components/ruby/puppet-modules/openstack-ironic/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-ironic/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = ironic
--- a/components/ruby/puppet-modules/openstack-keystone/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-keystone/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = keystone
--- a/components/ruby/puppet-modules/openstack-neutron/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-neutron/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = neutron
--- a/components/ruby/puppet-modules/openstack-nova/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-nova/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = nova
--- a/components/ruby/puppet-modules/openstack-openstacklib/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-openstacklib/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = openstacklib
--- a/components/ruby/puppet-modules/openstack-swift/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-swift/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = swift
--- a/components/ruby/puppet-modules/openstack-vswitch/Makefile Thu Feb 23 23:00:52 2017 -0800
+++ b/components/ruby/puppet-modules/openstack-vswitch/Makefile Fri Feb 24 09:00:04 2017 -0800
@@ -40,6 +40,11 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
+# The OpenStack Puppet modules are release-specific. Since the Mitaka
+# OpenStack components are excluded from the FOSS evaluation repo,
+# this module needs to be excluded as well
+BUILD_BITS=NO_ARCH
+include $(WS_MAKE_RULES)/no-evaluation.mk
include $(WS_MAKE_RULES)/ips.mk
MODULE_NAME = vswitch