From d926dfba758be9db6bed30df8bd334c73408cdf8 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 16 Sep 2014 15:22:23 -0400 Subject: core: update core projects to juno b3 release Along with this update, we also fix a bug with nova and neutron port types. this patch will be removed once it is fixed in the upstream project. Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-barbican_git.bb | 4 +- .../python/python-ceilometer_git.bb | 4 +- .../recipes-devtools/python/python-cinder_git.bb | 4 +- ...ance-change-builtin-tests-config-location.patch | 56 +++++++++++----------- .../recipes-devtools/python/python-glance_git.bb | 8 ++-- .../recipes-devtools/python/python-heat_git.bb | 4 +- .../recipes-devtools/python/python-horizon_git.bb | 6 ++- .../recipes-devtools/python/python-keystone_git.bb | 4 +- .../python/python-keystonemiddleware_git.bb | 4 +- .../recipes-devtools/python/python-neutron_git.bb | 4 +- ...neutron-api-set-default-binding-vnic_type.patch | 31 ++++++++++++ .../recipes-devtools/python/python-nova_git.bb | 5 +- .../recipes-devtools/python/python-swift_git.bb | 4 +- 13 files changed, 87 insertions(+), 51 deletions(-) create mode 100644 meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index ec042e9..7885ab5 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ file://barbican-handle-white-space-in-date-strings.patch \ " -SRCREV="d7f50d3161302b897febaf98243c7402abd5b156" -PV="2014.2.b2+git${SRCPV}" +SRCREV="ada968e162d9795613bfb346a1018f63ef7025cc" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" inherit update-rc.d setuptools identity hosts useradd default_configs diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index ebc7255..816088e 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ # file://ceilometer-builtin-tests-config-location.patch -SRCREV="fec77dbc85fed701fdbc3a96bae57e5ae3a705cb" -PV="2014.2.b2+git${SRCPV}" +SRCREV="500388c3fe8be48be046908acd549f5e28608921" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" CEILOMETER_SECRET ?= "12121212" diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index d9a1407..5abf4bc 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://cinder-builtin-tests-config-location.patch \ " -SRCREV="ddcad011db507cde66b6b1e655d5ffc91ab8880f" -PV="2014.2.b2+git${SRCPV}" +SRCREV="58eda5d1f41082a7e1ffef66239be30b8ac1321a" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d identity default_configs hosts diff --git a/meta-openstack/recipes-devtools/python/python-glance/glance-change-builtin-tests-config-location.patch b/meta-openstack/recipes-devtools/python/python-glance/glance-change-builtin-tests-config-location.patch index 4f82a53..87bfd4a 100644 --- a/meta-openstack/recipes-devtools/python/python-glance/glance-change-builtin-tests-config-location.patch +++ b/meta-openstack/recipes-devtools/python/python-glance/glance-change-builtin-tests-config-location.patch @@ -10,11 +10,11 @@ these configuration files using absolute path. Signed-off-by: Vu Tran -diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py -index 1256133..01adb81 100644 ---- a/glance/tests/functional/__init__.py -+++ b/glance/tests/functional/__init__.py -@@ -900,7 +900,7 @@ class FunctionalTest(test_utils.BaseTestCase): +Index: git/glance/tests/functional/__init__.py +=================================================================== +--- git.orig/glance/tests/functional/__init__.py ++++ git/glance/tests/functional/__init__.py +@@ -849,7 +849,7 @@ return engine.execute(sql) def copy_data_file(self, file_name, dst_dir): @@ -23,11 +23,11 @@ index 1256133..01adb81 100644 shutil.copy(src_file_name, dst_dir) dst_file_name = os.path.join(dst_dir, file_name) return dst_file_name -diff --git a/glance/tests/unit/api/test_common.py b/glance/tests/unit/api/test_common.py -index 8892025..2aac6b7 100644 ---- a/glance/tests/unit/api/test_common.py -+++ b/glance/tests/unit/api/test_common.py -@@ -137,7 +137,7 @@ class TestMalformedRequest(test_utils.BaseTestCase): +Index: git/glance/tests/unit/api/test_common.py +=================================================================== +--- git.orig/glance/tests/unit/api/test_common.py ++++ git/glance/tests/unit/api/test_common.py +@@ -135,7 +135,7 @@ super(TestMalformedRequest, self).setUp() self.config(flavor='', group='paste_deploy', @@ -36,11 +36,11 @@ index 8892025..2aac6b7 100644 self.api = config.load_paste_app('glance-api') def test_redirect_incomplete_url(self): -diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py -index 4a19730..16ec103 100644 ---- a/glance/tests/unit/base.py -+++ b/glance/tests/unit/base.py -@@ -76,7 +76,7 @@ class IsolatedUnitTest(StoreClearingUnitTest): +Index: git/glance/tests/unit/base.py +=================================================================== +--- git.orig/glance/tests/unit/base.py ++++ git/glance/tests/unit/base.py +@@ -80,7 +80,7 @@ registry=self.registry) def _copy_data_file(self, file_name, dst_dir): @@ -49,11 +49,11 @@ index 4a19730..16ec103 100644 shutil.copy(src_file_name, dst_dir) dst_file_name = os.path.join(dst_dir, file_name) return dst_file_name -diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py -index 2dfede1..422a458 100644 ---- a/glance/tests/unit/common/test_config.py -+++ b/glance/tests/unit/common/test_config.py -@@ -64,8 +64,7 @@ class TestPasteApp(test_utils.BaseTestCase): +Index: git/glance/tests/unit/common/test_config.py +=================================================================== +--- git.orig/glance/tests/unit/common/test_config.py ++++ git/glance/tests/unit/common/test_config.py +@@ -63,8 +63,7 @@ paste_to = temp_file.replace('.conf', '-paste.ini') if not paste_config_file and make_paste_file: @@ -63,22 +63,22 @@ index 2dfede1..422a458 100644 _appendto(paste_from, paste_to, paste_append) app = config.load_paste_app('glance-registry') -@@ -90,8 +89,7 @@ class TestPasteApp(test_utils.BaseTestCase): +@@ -89,8 +88,7 @@ paste_append=pipeline) def test_load_paste_app_with_paste_config_file(self): - paste_config_file = os.path.join(os.getcwd(), - 'etc/glance-registry-paste.ini') + paste_config_file = '/etc/glance/glance-registry-paste.ini' - expected_middleware = context.UnauthenticatedContextMiddleware + expected_middleware = osprofiler.web.WsgiMiddleware self._do_test_load_paste_app(expected_middleware, paste_config_file=paste_config_file) -diff --git a/glance/tests/utils.py b/glance/tests/utils.py -index 760824c..db598ba 100644 ---- a/glance/tests/utils.py -+++ b/glance/tests/utils.py -@@ -67,7 +67,7 @@ class BaseTestCase(testtools.TestCase): - self.config(property_protection_file=self.property_file) +Index: git/glance/tests/utils.py +=================================================================== +--- git.orig/glance/tests/utils.py ++++ git/glance/tests/utils.py +@@ -76,7 +76,7 @@ + property_utils.CONFIG.remove_section(section) def _copy_data_file(self, file_name, dst_dir): - src_file_name = os.path.join('glance/tests/etc', file_name) diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 6a5370b..52c0ebf 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -8,13 +8,14 @@ PR = "r0" SRCNAME = "glance" SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ - file://0001-glance-store-only-load-known-stores-not-all-stores.patch \ file://glance.init \ file://glance-change-builtin-tests-config-location.patch \ " -SRCREV="e66ecfee4eacfe25a18cd05d3f88e25c91fa112c" -PV="2014.2.b2+git${SRCPV}" +# removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch + +SRCREV="7374d9347eeb6b354484984f06fd7e58fed50046" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" @@ -177,6 +178,7 @@ RDEPENDS_${PN} += "python-greenlet \ python-oslo.i18n \ python-osprofiler \ python-retrying \ + python-glancestore \ " RDEPENDS_${SRCNAME} = "${PN} \ diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 1041656..b094a4c 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://heat-tests-change-project_dir-path.patch \ " -SRCREV="04de60093b602c2eac4a612df5d4a2e31424a25d" -PV="2014.2.b2+git${SRCPV}" +SRCREV="9b700a1b6e1c806d8deba64ffb9a804790765678" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index b472aa9..428507a 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -41,6 +41,8 @@ RDEPENDS_${PN} += "python-django \ python-xstatic-qunit \ python-xstatic-rickshaw \ python-xstatic-spin \ + python-xstatic-bootstrap-datepicker \ + python-xstatic-font-awesome \ " PR = "r2" @@ -54,8 +56,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://horizon-use-full-package-path-to-test-directories.patch \ " -SRCREV="8f808a69f6f64c7d92571989b72da1d1801a1c86" -PV="2014.2.b2+git${SRCPV}" +SRCREV="bd998fb6094fb16d084c90de1eed619aca4c31ef" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d python-dir default_configs diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 0a71020..88a6d5d 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://convert_keystone_backend.py \ " -SRCREV="dbede9c262168ff9ef9fd3b7f5ed2bc20ebd01f8" -PV="2014.2.b2+git${SRCPV}" +SRCREV="73ad4036d62b3aa7cf50e11ddf7bee8278bbe4d0" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb index d315fe1..f99dcd7 100644 --- a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb @@ -11,8 +11,8 @@ SRC_URI = "\ git://git.openstack.org/openstack/keystonemiddleware;branch=master \ " -PV="1.0.0+git${SRCPV}" -SRCREV="ce965ead938015cb7410f21141f5d76df4b3a0ce" +PV="1.1.1+git${SRCPV}" +SRCREV="a4c13473aa09edee3c16733a4ff16f2cc206ad66" S = "${WORKDIR}/git" inherit setuptools diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index fa933d5..fb859af 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://uuid_wscheck.patch \ file://neutron-test-nec-plugin-extensions-location.patch \ " -SRCREV="dca18ad307fdc9f33ab3421478c7fce373a1264d" -PV="2014.2.b2+git${SRCPV}" +SRCREV="3cd2550f1bb20dbbc00a01d8dfd8b53e00baa00d" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch b/meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch new file mode 100644 index 0000000..5f2e950 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/neutron-api-set-default-binding-vnic_type.patch @@ -0,0 +1,31 @@ +From 5f7ffa7f9eb0e35b8a18a6f0bf680149af174232 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Tue, 16 Sep 2014 15:14:15 -0400 +Subject: [PATCH] neutron/api: set default binding:vnic_type + +Fix the following issue: https://bugs.launchpad.net/neutron/+bug/1370077, +by ensuring that if the backend driver doesn't set vnic_type, that the +default of VNIC_TYPE_NORMAL is used. + +Signed-off-by: Bruce Ashfield +--- + nova/network/neutronv2/api.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py +index 124640e1a275..67811788e1a4 100644 +--- a/nova/network/neutronv2/api.py ++++ b/nova/network/neutronv2/api.py +@@ -1361,6 +1361,9 @@ class API(base_api.NetworkAPI): + or current_neutron_port['status'] == 'ACTIVE'): + vif_active = True + ++ if not 'binding:vnic_type' in current_neutron_port: ++ current_neutron_port['binding:vnic_type'] = network_model.VNIC_TYPE_NORMAL ++ + network_IPs = self._nw_info_get_ips(client, + current_neutron_port) + subnets = self._nw_info_get_subnets(context, +-- +1.9.1 + diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 580193c..207b965 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://nova-convert-path-from-relative-to-absolute.patch \ file://nova-fix-location-to-doc-directory.patch \ file://nova-fix-location-to-plugin-directory.patch \ + file://neutron-api-set-default-binding-vnic_type.patch \ " SRC_URI += "file://nova-all \ @@ -24,8 +25,8 @@ SRC_URI += "file://nova-all \ file://nova.conf \ file://openrc \ " -SRCREV="e15ce7735e492f9eb0914efb621211e315ea40d9" -PV="2014.2.b2+git${SRCPV}" +SRCREV="a5f09ddddfba65b8fdc6bac994750e5980b27521" +PV="2014.2.b3+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index e42188e..b00788f 100644 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://cluster.conf \ " -SRCREV="8d02147d04a41477383de8e13bea6ac3fd2cade0" -PV="2.1.0.rc1+git${SRCPV}" +SRCREV="d4da726f6f45187dc053578f11246d6b36679142" +PV="2.1.0+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools python-dir update-rc.d hosts identity -- cgit v1.2.3-54-g00ecf