From 825048fe5ef82644ae5bb2833e71b295e759d7e1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 10 Mar 2015 13:57:10 -0400 Subject: core: BROKEN: Initial update to kilo branches and REVs This is the initial update to the kilo branches and SRCREVs for some of the core projects. These are known to NOT work, due to SSLv3 issues with oe-core, and missing config/dependencies. Incremental updates will fix issues with the components, but they are best done in-tree, rather than sitting on a huge pile of changes. Signed-off-by: Bruce Ashfield --- .../recipes-devtools/python/python-barbican_git.bb | 4 ++-- .../recipes-devtools/python/python-ceilometer_git.bb | 6 +++--- .../recipes-devtools/python/python-cinder_git.bb | 13 +++++++------ .../recipes-devtools/python/python-glance_git.bb | 8 ++++---- .../recipes-devtools/python/python-glancestore_git.bb | 4 ++-- meta-openstack/recipes-devtools/python/python-heat_git.bb | 13 ++++++++----- .../recipes-devtools/python/python-horizon_git.bb | 9 ++++++--- .../recipes-devtools/python/python-keystone_git.bb | 15 +++++++++------ .../python/python-keystonemiddleware_git.bb | 4 ++-- .../recipes-devtools/python/python-neutron_git.bb | 11 +++++++---- meta-openstack/recipes-devtools/python/python-nova_git.bb | 13 +++++++------ 11 files changed, 57 insertions(+), 43 deletions(-) (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 5e74b65..7f5184b 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="c171f491014ef504e05a3e86877e28763e72452f" -PV="2014.2+git${SRCPV}" +SRCREV="4744374458f14cc54c53daf946e7df2916f5c713" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" inherit update-rc.d setuptools identity hosts useradd default_configs openstackchef monitor diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 5c6fbbb..e734d32 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "ceilometer" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://ceilometer.conf \ file://ceilometer.init \ file://fix_ceilometer_memory_leak.patch \ @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ # file://ceilometer-builtin-tests-config-location.patch -SRCREV="b1fca33e5f4c5443389d131a212a058d2306ac23" -PV="2014.2+git${SRCPV}" +SRCREV="b2871217fec965c77581b0f4a33608dad7867d4b" +PV="2015.1.0b2+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 a51d27a..9276d1f 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -7,21 +7,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "cinder" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://cinder.conf \ file://cinder.init \ file://cinder-volume \ - file://0001-run_tests-respect-tools-dir.patch \ file://nfs_setup.sh \ file://glusterfs_setup.sh \ file://lvm_iscsi_setup.sh \ file://add-cinder-volume-types.sh \ - file://fix_cinder_memory_leak.patch \ file://cinder-builtin-tests-config-location.patch \ - " + " + +# file://0001-run_tests-respect-tools-dir.patch +# file://fix_cinder_memory_leak.patch -SRCREV="7b1d7a31335bd8723551c9af5c270927ad830c3f" -PV="2014.2+git${SRCPV}" +SRCREV="f4f46e972004eca66e4751a836156c342e448621" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d identity default_configs hosts openstackchef monitor diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index b1d97c4..dd6d0ef 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -7,15 +7,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "glance" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://glance.init \ - file://glance-change-builtin-tests-config-location.patch \ " # removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch +# file://glance-change-builtin-tests-config-location.patch -SRCREV="c5e302ef220803b6c86d588ddcff9a63eaaaccc2" -PV="2014.2+git${SRCPV}" +SRCREV="c84d8c98bc0dd64d79bd1e659b9561d47b3428c1" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb index 33feae3..b3aa2f3 100644 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" -SRCREV = "32d5baa37d1efe1f5372d0171c7edcd719885db6" -PV = "0.1.7+git${SRCPV}" +SRCREV = "bd592d3e33e5f6d222befd53523c97aaa478b175" +PV = "0.1.11+git${SRCPV}" SRC_URI = "\ git://github.com/openstack/glance_store.git \ diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 8718147..87e93c7 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r0" SRCNAME = "heat" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://heat.conf \ file://heat.init \ file://autoscaling_example.template \ @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ file://heat-tests-change-project_dir-path.patch \ " -SRCREV="5664854f372b9810d040c615d8a678dbfdfb880e" -PV="2014.2+git${SRCPV}" +SRCREV="6d106dee26649202791596062b5a29049e962d80" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" @@ -103,7 +103,9 @@ do_install_append() { install -m 0755 ${WORKDIR}/heat-engine.init.sh ${D}${sysconfdir}/init.d/heat-engine fi - cp run_tests.sh ${HEAT_CONF_DIR} + if [ -e "run_tests.sh" ]; then + cp run_tests.sh ${HEAT_CONF_DIR} + fi } CHEF_SERVICES_CONF_FILES :="\ @@ -135,7 +137,7 @@ PACKAGES += "${SRCNAME}-cfn" RDEPENDS_${SRCNAME}-tests += " bash" - +ALLOW_EMPTY_${SRCNAME}-tests = "1" ALLOW_EMPTY_${SRCNAME}-setup = "1" ALLOW_EMPTY_${SRCNAME}-templates = "1" ALLOW_EMPTY_${SRCNAME}-cfn = "1" @@ -210,6 +212,7 @@ RDEPENDS_${PN} += " \ python-pip \ python-pytz \ python-pbr \ + python-oslo.log \ " RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-templates ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt ${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 47f6a7c..154c447 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -37,6 +37,7 @@ RDEPENDS_${PN} += " python-django \ python-xstatic-angular \ python-xstatic-angular-cookies \ python-xstatic-angular-mock \ + python-xstatic-angular-bootstrap \ python-xstatic-d3 \ python-xstatic-hogan \ python-xstatic-jasmine \ @@ -51,6 +52,8 @@ RDEPENDS_${PN} += " python-django \ python-xstatic-bootstrap-scss \ python-xstatic-font-awesome \ python-xstatic-jquery-ui \ + python-xstatic-smart-table \ + python-xstatic-term.js \ python-pyscss \ python-django-pyscss \ " @@ -58,7 +61,7 @@ RDEPENDS_${PN} += " python-django \ PR = "r3" SRCNAME = "horizon" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://horizon.init \ file://fix_bindir_path.patch \ file://openstack-dashboard-apache.conf \ @@ -66,8 +69,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ file://horizon-use-full-package-path-to-test-directories.patch \ " -SRCREV="ed895a181db0c75000cd0ef34ac0d769a295424c" -PV="2014.2+git${SRCPV}" +SRCREV="9b37723a21e88c29732e2a4a9eeeecb9ecf19204" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d python-dir default_configs openstackchef monitor diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index 35fdaef..e5896df 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -7,19 +7,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r2" SRCNAME = "keystone" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://keystone.conf \ file://identity.sh \ file://keystone \ - file://keystone-search-in-etc-directory-for-config-files.patch \ - file://keystone-remove-git-commands-in-tests.patch \ - file://keystone-explicitly-import-localcontext-from-oslo.me.patch \ file://convert_keystone_backend.py \ file://wsgi-keystone.conf \ " -SRCREV="f54fa8fa56d3708d5ef5b0173d9f6e4dce7130f2" -PV="2014.2+git${SRCPV}" +# TBD: update or drop +# file://keystone-search-in-etc-directory-for-config-files.patch +# file://keystone-remove-git-commands-in-tests.patch +# file://keystone-explicitly-import-localcontext-from-oslo.me.patch + +SRCREV="0e633302e87261fdb3b0126c632fd676fc0a4d39" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" @@ -279,6 +281,7 @@ RDEPENDS_${PN} += " \ python-dogpile.core \ python-dogpile.cache \ python-pbr \ + python-pysaml2 \ python-oslo.utils \ python-oauthlib \ " diff --git a/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb b/meta-openstack/recipes-devtools/python/python-keystonemiddleware_git.bb index 50cfd44..f4ce244 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.2.0+git${SRCPV}" -SRCREV="671285f4e62b59a003169313be3ae032175d9a1e" +PV="1.4.0+git${SRCPV}" +SRCREV="782fb0129d2eb7f181f890068767ce2b6906b2bd" 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 4166189..1a5a9b2 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" PR = "r1" SRCNAME = "neutron" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://neutron-server.init \ file://neutron-agent.init \ file://l3_agent.ini \ @@ -15,11 +15,14 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ file://metadata_agent.ini \ file://neutron-dhcp-agent-netns-cleanup.cron \ file://0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch \ - file://uuid_wscheck.patch \ file://neutron-test-nec-plugin-extensions-location.patch \ " -SRCREV="ad6fefcb4d4068b46b69284e277df6ab2ee30105" -PV="2014.2+git${SRCPV}" + +# TBD: update or drop +# file://uuid_wscheck.patch + +SRCREV="1948efa261e47b08e2cde4828321614ee6e169be" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index aa677ae..4966250 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -11,15 +11,15 @@ SRCNAME = "nova" FILESEXTRAPATHS_append := "${THISDIR}/${PN}" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ - 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 \ " # restore post stable/juno: # file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch +# 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 SRC_URI += "file://nova-all \ file://nova.init \ @@ -27,8 +27,8 @@ SRC_URI += "file://nova-all \ file://nova.conf \ file://openrc \ " -SRCREV="9c3ec16576e2f7c9d5aff6e4b620d708e6636568" -PV="2014.2+git${SRCPV}" +SRCREV="b6e11261a97bf96d5f9866f277d8ecc3be7891e5" +PV="2015.1.0b2+git${SRCPV}" S = "${WORKDIR}/git" @@ -297,6 +297,7 @@ RDEPENDS_${PN} = " libvirt \ python-oslo.rootwrap \ python-oslo.concurrency \ python-oslo.middleware \ + python-oslo.context \ python-paste \ python-pastedeploy \ python-paramiko \ -- cgit v1.2.3-54-g00ecf