aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 14:13:43 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-05-07 14:13:43 -0400
commitccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3 (patch)
tree25fed01879228603672beb26e882b5681d4c8096
parentca8b06893b0d584a0b5f15dd66b14da4f18100bc (diff)
parentdd04ca6db2993404284679ea04a80d9071f90c2b (diff)
downloadmeta-cloud-services-ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3.tar.gz
meta-cloud-services-ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3.tar.bz2
meta-cloud-services-ccff64bdb16ff222d13cc3a61d6c6dbd30ea50f3.zip
Merge branch 'master' into kilo
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican_git.bb6
-rw-r--r--meta-openstack/recipes-devtools/python/python-ceilometer_git.bb6
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb6
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance_git.bb6
-rw-r--r--meta-openstack/recipes-devtools/python/python-heat_git.bb6
-rw-r--r--meta-openstack/recipes-devtools/python/python-horizon_git.bb7
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone_git.bb7
-rw-r--r--meta-openstack/recipes-devtools/python/python-neutron_git.bb7
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova_git.bb7
9 files changed, 27 insertions, 31 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
index 24557ad..15459f1 100644
--- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb
@@ -8,15 +8,15 @@ PR = "r0"
SRCNAME = "barbican"
BARBICAN_MAX_PACKET_SIZE ?= "65535"
-SRC_URI = "git://github.com/openstack/barbican.git;branch=master \
+SRC_URI = "git://github.com/openstack/barbican.git;branch=stable/kilo \
file://barbican.init \
file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \
file://barbican-fix-path-to-find-configuration-files.patch \
file://barbican-handle-white-space-in-date-strings.patch \
"
-SRCREV = "12966ea7ad40622e4189d832d13f4d9bfb9f3ada"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "e6f05febbe18a86e4e6b05acc5f4868fa3beb291"
+PV = "2015.1.0+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 b5f0e22..3860ca5 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=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
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=master \
# file://ceilometer-builtin-tests-config-location.patch
-SRCREV = "348ecb0861637da5575b094f8fa3fab1e3770928"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "b0447ed8e7bee371bf7095c86e47d717abe89edc"
+PV = "2015.1.0+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 9276d1f..ceb17d8 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
PR = "r0"
SRCNAME = "cinder"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://cinder.conf \
file://cinder.init \
file://cinder-volume \
@@ -21,8 +21,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
# file://0001-run_tests-respect-tools-dir.patch
# file://fix_cinder_memory_leak.patch
-SRCREV="f4f46e972004eca66e4751a836156c342e448621"
-PV="2015.1.0b2+git${SRCPV}"
+SRCREV = "5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d"
+PV = "2015.1.0+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 694a301..ea189ef 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=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://glance.init \
"
# 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 = "232a8786dd01d4effc2ba15802792b08d0373676"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95"
+PV = "2015.1.0+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 7750c93..7abb4d0 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=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://heat.conf \
file://heat.init \
file://autoscaling_example.template \
@@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
file://heat-tests-change-project_dir-path.patch \
"
-SRCREV = "34cc6d7e96e1a54dce5c91cc09583e08f2fa778e"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "6db88597dba0b79b2501f43b704c93b2728a5ec6"
+PV = "2015.1.0+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 376a4d1..55a2a38 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -59,10 +59,9 @@ RDEPENDS_${PN} += " python-django \
python-django-pyscss \
"
-PR = "r3"
SRCNAME = "horizon"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://horizon.init \
file://fix_bindir_path.patch \
file://openstack-dashboard-apache.conf \
@@ -70,8 +69,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
file://horizon-use-full-package-path-to-test-directories.patch \
"
-SRCREV = "a174b4294dd26967953d404207763828c83cc2f7"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "b99cf48ff346494198fb9740495eacc14fa406bf"
+PV = "2015.1.0+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 70cc790..b13d36b 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-PR = "r2"
SRCNAME = "keystone"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://keystone.conf \
file://identity.sh \
file://keystone \
@@ -20,8 +19,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
# file://keystone-remove-git-commands-in-tests.patch
# file://keystone-explicitly-import-localcontext-from-oslo.me.patch
-SRCREV = "5933546ecbdb5a52abe31413ac7a18cc49ab23df"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "5d3b31f9c3d34599ff8a83eeb7530fc6e0b1b67b"
+PV = "2015.1.0+git${SRCPV}"
S = "${WORKDIR}/git"
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 3c64d61..b9cf518 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -4,10 +4,9 @@ SECTION = "devel/python"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
-PR = "r1"
SRCNAME = "neutron"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://neutron-server.init \
file://neutron-agent.init \
file://l3_agent.ini \
@@ -20,8 +19,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
# TBD: update or drop
# file://uuid_wscheck.patch
-SRCREV = "e86077e8452891cc176841dd6b6316831e12abc1"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "7260e0e3fc2ea479e80e0962624aca7fd38a1f60"
+PV = "2015.1.0+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 71b5154..4e96341 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
DEPENDS = "sudo libvirt"
-PR = "r0"
SRCNAME = "nova"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
-SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \
+SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \
file://nova-add-migrate.cfg-to-the-MANIFEST.patch \
file://neutron-api-set-default-binding-vnic_type.patch \
"
@@ -27,8 +26,8 @@ SRC_URI += "file://nova-all \
file://nova.conf \
file://openrc \
"
-SRCREV = "dfcfa82af96bae12265875cb313d58109e536480"
-PV = "2015.1.0b3+git${SRCPV}"
+SRCREV = "8397b6464af520903f546ce4c6d51a2eb5b4c8a8"
+PV = "2015.1.0+git${SRCPV}"
S = "${WORKDIR}/git"