From 6549b2afe37bc17cafd8c6a824cd799afa1bb35b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 29 Aug 2014 09:47:53 -0400 Subject: core: update core projects to juno 2014.2-b2 versions Signed-off-by: Bruce Ashfield --- ...ncrease-buffer-size-to-support-PKI-tokens.patch | 28 ++++++++++------------ .../recipes-devtools/python/python-barbican_git.bb | 4 ++-- .../python/python-ceilometer_git.bb | 8 ++++--- .../recipes-devtools/python/python-cinder_git.bb | 4 ++-- .../recipes-devtools/python/python-glance_git.bb | 4 ++-- .../recipes-devtools/python/python-heat_git.bb | 4 ++-- .../recipes-devtools/python/python-horizon_git.bb | 4 ++-- .../recipes-devtools/python/python-keystone_git.bb | 5 ++-- .../recipes-devtools/python/python-neutron_git.bb | 6 +++-- .../recipes-devtools/python/python-nova_git.bb | 5 ++-- .../recipes-devtools/python/python-swift_git.bb | 4 ++-- .../recipes-extended/tempest/tempest_git.bb | 2 +- 12 files changed, 41 insertions(+), 37 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch b/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch index b0e87de..acde89c 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch +++ b/meta-openstack/recipes-devtools/python/python-barbican/barbican-increase-buffer-size-to-support-PKI-tokens.patch @@ -15,24 +15,22 @@ Signed-off-by: Keith Holman etc/barbican/vassals/barbican-api.ini | 1 + 2 files changed, 2 insertions(+) -diff --git a/etc/barbican/vassals/barbican-admin.ini b/etc/barbican/vassals/barbican-admin.ini -index e270b13..3b58430 100644 ---- a/etc/barbican/vassals/barbican-admin.ini -+++ b/etc/barbican/vassals/barbican-admin.ini -@@ -8,3 +8,4 @@ no-default-app = true - memory-report = true +Index: git/etc/barbican/vassals/barbican-admin.ini +=================================================================== +--- git.orig/etc/barbican/vassals/barbican-admin.ini ++++ git/etc/barbican/vassals/barbican-admin.ini +@@ -9,3 +9,4 @@ plugins = python paste = config:/etc/barbican/barbican-admin-paste.ini + add-header = Connection: close +buffer-size = %BARBICAN_MAX_PACKET_SIZE% -diff --git a/etc/barbican/vassals/barbican-api.ini b/etc/barbican/vassals/barbican-api.ini -index 8f6f504..82de732 100644 ---- a/etc/barbican/vassals/barbican-api.ini -+++ b/etc/barbican/vassals/barbican-api.ini -@@ -8,3 +8,4 @@ no-default-app = true - memory-report = true +Index: git/etc/barbican/vassals/barbican-api.ini +=================================================================== +--- git.orig/etc/barbican/vassals/barbican-api.ini ++++ git/etc/barbican/vassals/barbican-api.ini +@@ -9,3 +9,4 @@ plugins = python paste = config:/etc/barbican/barbican-api-paste.ini + add-header = Connection: close +buffer-size = %BARBICAN_MAX_PACKET_SIZE% --- -1.9.0 - +\ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 5682f9c..ec042e9 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="84408b7148234f6e5adbe43e838afe0ad020586e" -PV="2014.1+git${SRCPV}" +SRCREV="d7f50d3161302b897febaf98243c7402abd5b156" +PV="2014.2.b2+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 ad35de2..ebc7255 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -11,11 +11,13 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://ceilometer.conf \ file://ceilometer.init \ file://fix_ceilometer_memory_leak.patch \ - file://ceilometer-builtin-tests-config-location.patch \ " +# dropped for juno: +# file://ceilometer-builtin-tests-config-location.patch -SRCREV="d4baab8a135b88ccb673b8e6dd35386786b52281" -PV="2014.2.b1+git${SRCPV}" + +SRCREV="fec77dbc85fed701fdbc3a96bae57e5ae3a705cb" +PV="2014.2.b2+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 20fe459..d9a1407 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="116f54dbf188a17b5e3dd966658e98bf19b8912b" -PV="2014.2.b1+git${SRCPV}" +SRCREV="ddcad011db507cde66b6b1e655d5ffc91ab8880f" +PV="2014.2.b2+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d identity default_configs hosts diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index b3d3ee1..6a5370b 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -13,8 +13,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://glance-change-builtin-tests-config-location.patch \ " -SRCREV="92ab00fca6926eaf3f7f92a955a5e07140063718" -PV="2014.2.b1+git${SRCPV}" +SRCREV="e66ecfee4eacfe25a18cd05d3f88e25c91fa112c" +PV="2014.2.b2+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index fd21af2..1041656 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="45f97e6a840bbba2a467558e60549e664496633e" -PV="2014.2.b1+git${SRCPV}" +SRCREV="04de60093b602c2eac4a612df5d4a2e31424a25d" +PV="2014.2.b2+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 69dd430..c7d8817 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -41,8 +41,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://horizon-use-full-package-path-to-test-directories.patch \ " -SRCREV="826444b9eabbaab11cb64018be0777493f1a5fc1" -PV="2014.2.b1+git${SRCPV}" +SRCREV="8f808a69f6f64c7d92571989b72da1d1801a1c86" +PV="2014.2.b2+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 808c3f6..0a71020 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="1070afe2cb8707ad28d43c4ea76116a941cf2131" -PV="2014.2.b1+git${SRCPV}" +SRCREV="dbede9c262168ff9ef9fd3b7f5ed2bc20ebd01f8" +PV="2014.2.b2+git${SRCPV}" S = "${WORKDIR}/git" @@ -221,6 +221,7 @@ RDEPENDS_${PN} += " \ python-dogpile.core \ python-dogpile.cache \ python-pbr \ + python-oslo.utils \ " PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 8eb5788..fa933d5 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="57011b901f0c26c840c207e007e392ba9ff5890b" -PV="2014.2.b1+git${SRCPV}" +SRCREV="dca18ad307fdc9f33ab3421478c7fce373a1264d" +PV="2014.2.b2+git${SRCPV}" S = "${WORKDIR}/git" @@ -148,6 +148,8 @@ pkg_postinst_${SRCNAME}-setup () { fi sudo -u postgres createdb ovs_neutron + sudo neutron-db-manage --config-file /etc/neutron/neutron.conf \ + --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini upgrade head } pkg_postinst_${SRCNAME}-plugin-openvswitch-setup () { diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 56209b8..f6c090f 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -24,8 +24,8 @@ SRC_URI += "file://nova-all \ file://nova.conf \ file://openrc \ " -SRCREV="e0331cfe9d49f25b8a23f5fc473f610415bb07ac" -PV="2014.2.b1+git${SRCPV}" +SRCREV="e15ce7735e492f9eb0914efb621211e315ea40d9" +PV="2014.2.b2+git${SRCPV}" S = "${WORKDIR}/git" @@ -304,6 +304,7 @@ RDEPENDS_${PN} = " libvirt \ python-pbr \ spice-html5 \ python-posix-ipc \ + python-rfc3986 \ " RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index 16f99f7..e42188e 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="116ac459a64471b09a5e989e88349c66f470ce38" -PV="2.0.0+git${SRCPV}" +SRCREV="8d02147d04a41477383de8e13bea6ac3fd2cade0" +PV="2.1.0.rc1+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools python-dir update-rc.d hosts identity diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb index d03cbc1..c7d1dd0 100644 --- a/meta-openstack/recipes-extended/tempest/tempest_git.bb +++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://logging.conf \ " -SRCREV="064e965b70190c2446a9355a5f5e83de0df5250e" +SRCREV="2707a0f065e52d8331d12c983ead95de1224cb32" PV="2014.1+git${SRCPV}" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf