diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-29 09:47:53 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-29 09:47:53 -0400 |
commit | 6549b2afe37bc17cafd8c6a824cd799afa1bb35b (patch) | |
tree | 5c118c6fec996d7c2b314812fb4be6c572deda34 /meta-openstack | |
parent | 6fbb59a85e7e495eaee7fd580dcdac2ecedcf790 (diff) | |
download | meta-cloud-services-6549b2afe37bc17cafd8c6a824cd799afa1bb35b.tar.gz |
core: update core projects to juno 2014.2-b2 versions
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
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 <Keith.Holman@windriver.com> | |||
15 | etc/barbican/vassals/barbican-api.ini | 1 + | 15 | etc/barbican/vassals/barbican-api.ini | 1 + |
16 | 2 files changed, 2 insertions(+) | 16 | 2 files changed, 2 insertions(+) |
17 | 17 | ||
18 | diff --git a/etc/barbican/vassals/barbican-admin.ini b/etc/barbican/vassals/barbican-admin.ini | 18 | Index: git/etc/barbican/vassals/barbican-admin.ini |
19 | index e270b13..3b58430 100644 | 19 | =================================================================== |
20 | --- a/etc/barbican/vassals/barbican-admin.ini | 20 | --- git.orig/etc/barbican/vassals/barbican-admin.ini |
21 | +++ b/etc/barbican/vassals/barbican-admin.ini | 21 | +++ git/etc/barbican/vassals/barbican-admin.ini |
22 | @@ -8,3 +8,4 @@ no-default-app = true | 22 | @@ -9,3 +9,4 @@ |
23 | memory-report = true | ||
24 | plugins = python | 23 | plugins = python |
25 | paste = config:/etc/barbican/barbican-admin-paste.ini | 24 | paste = config:/etc/barbican/barbican-admin-paste.ini |
25 | add-header = Connection: close | ||
26 | +buffer-size = %BARBICAN_MAX_PACKET_SIZE% | 26 | +buffer-size = %BARBICAN_MAX_PACKET_SIZE% |
27 | diff --git a/etc/barbican/vassals/barbican-api.ini b/etc/barbican/vassals/barbican-api.ini | 27 | Index: git/etc/barbican/vassals/barbican-api.ini |
28 | index 8f6f504..82de732 100644 | 28 | =================================================================== |
29 | --- a/etc/barbican/vassals/barbican-api.ini | 29 | --- git.orig/etc/barbican/vassals/barbican-api.ini |
30 | +++ b/etc/barbican/vassals/barbican-api.ini | 30 | +++ git/etc/barbican/vassals/barbican-api.ini |
31 | @@ -8,3 +8,4 @@ no-default-app = true | 31 | @@ -9,3 +9,4 @@ |
32 | memory-report = true | ||
33 | plugins = python | 32 | plugins = python |
34 | paste = config:/etc/barbican/barbican-api-paste.ini | 33 | paste = config:/etc/barbican/barbican-api-paste.ini |
34 | add-header = Connection: close | ||
35 | +buffer-size = %BARBICAN_MAX_PACKET_SIZE% | 35 | +buffer-size = %BARBICAN_MAX_PACKET_SIZE% |
36 | -- | 36 | \ No newline at end of file |
37 | 1.9.0 | ||
38 | |||
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 \ | |||
15 | file://barbican-handle-white-space-in-date-strings.patch \ | 15 | file://barbican-handle-white-space-in-date-strings.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRCREV="84408b7148234f6e5adbe43e838afe0ad020586e" | 18 | SRCREV="d7f50d3161302b897febaf98243c7402abd5b156" |
19 | PV="2014.1+git${SRCPV}" | 19 | PV="2014.2.b2+git${SRCPV}" |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit update-rc.d setuptools identity hosts useradd default_configs | 22 | 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 \ | |||
11 | file://ceilometer.conf \ | 11 | file://ceilometer.conf \ |
12 | file://ceilometer.init \ | 12 | file://ceilometer.init \ |
13 | file://fix_ceilometer_memory_leak.patch \ | 13 | file://fix_ceilometer_memory_leak.patch \ |
14 | file://ceilometer-builtin-tests-config-location.patch \ | ||
15 | " | 14 | " |
15 | # dropped for juno: | ||
16 | # file://ceilometer-builtin-tests-config-location.patch | ||
16 | 17 | ||
17 | SRCREV="d4baab8a135b88ccb673b8e6dd35386786b52281" | 18 | |
18 | PV="2014.2.b1+git${SRCPV}" | 19 | SRCREV="fec77dbc85fed701fdbc3a96bae57e5ae3a705cb" |
20 | PV="2014.2.b2+git${SRCPV}" | ||
19 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
20 | 22 | ||
21 | CEILOMETER_SECRET ?= "12121212" | 23 | 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 \ | |||
20 | file://cinder-builtin-tests-config-location.patch \ | 20 | file://cinder-builtin-tests-config-location.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRCREV="116f54dbf188a17b5e3dd966658e98bf19b8912b" | 23 | SRCREV="ddcad011db507cde66b6b1e655d5ffc91ab8880f" |
24 | PV="2014.2.b1+git${SRCPV}" | 24 | PV="2014.2.b2+git${SRCPV}" |
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | 26 | ||
27 | inherit setuptools update-rc.d identity default_configs hosts | 27 | 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 \ | |||
13 | file://glance-change-builtin-tests-config-location.patch \ | 13 | file://glance-change-builtin-tests-config-location.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRCREV="92ab00fca6926eaf3f7f92a955a5e07140063718" | 16 | SRCREV="e66ecfee4eacfe25a18cd05d3f88e25c91fa112c" |
17 | PV="2014.2.b1+git${SRCPV}" | 17 | PV="2014.2.b2+git${SRCPV}" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
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 \ | |||
16 | file://heat-tests-change-project_dir-path.patch \ | 16 | file://heat-tests-change-project_dir-path.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV="45f97e6a840bbba2a467558e60549e664496633e" | 19 | SRCREV="04de60093b602c2eac4a612df5d4a2e31424a25d" |
20 | PV="2014.2.b1+git${SRCPV}" | 20 | PV="2014.2.b2+git${SRCPV}" |
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" | 23 | 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 \ | |||
41 | file://horizon-use-full-package-path-to-test-directories.patch \ | 41 | file://horizon-use-full-package-path-to-test-directories.patch \ |
42 | " | 42 | " |
43 | 43 | ||
44 | SRCREV="826444b9eabbaab11cb64018be0777493f1a5fc1" | 44 | SRCREV="8f808a69f6f64c7d92571989b72da1d1801a1c86" |
45 | PV="2014.2.b1+git${SRCPV}" | 45 | PV="2014.2.b2+git${SRCPV}" |
46 | S = "${WORKDIR}/git" | 46 | S = "${WORKDIR}/git" |
47 | 47 | ||
48 | inherit setuptools update-rc.d python-dir default_configs | 48 | 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 \ | |||
16 | file://convert_keystone_backend.py \ | 16 | file://convert_keystone_backend.py \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV="1070afe2cb8707ad28d43c4ea76116a941cf2131" | 19 | SRCREV="dbede9c262168ff9ef9fd3b7f5ed2bc20ebd01f8" |
20 | PV="2014.2.b1+git${SRCPV}" | 20 | PV="2014.2.b2+git${SRCPV}" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
@@ -221,6 +221,7 @@ RDEPENDS_${PN} += " \ | |||
221 | python-dogpile.core \ | 221 | python-dogpile.core \ |
222 | python-dogpile.cache \ | 222 | python-dogpile.cache \ |
223 | python-pbr \ | 223 | python-pbr \ |
224 | python-oslo.utils \ | ||
224 | " | 225 | " |
225 | 226 | ||
226 | PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" | 227 | 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 \ | |||
20 | file://uuid_wscheck.patch \ | 20 | file://uuid_wscheck.patch \ |
21 | file://neutron-test-nec-plugin-extensions-location.patch \ | 21 | file://neutron-test-nec-plugin-extensions-location.patch \ |
22 | " | 22 | " |
23 | SRCREV="57011b901f0c26c840c207e007e392ba9ff5890b" | 23 | SRCREV="dca18ad307fdc9f33ab3421478c7fce373a1264d" |
24 | PV="2014.2.b1+git${SRCPV}" | 24 | PV="2014.2.b2+git${SRCPV}" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
27 | 27 | ||
@@ -148,6 +148,8 @@ pkg_postinst_${SRCNAME}-setup () { | |||
148 | fi | 148 | fi |
149 | 149 | ||
150 | sudo -u postgres createdb ovs_neutron | 150 | sudo -u postgres createdb ovs_neutron |
151 | sudo neutron-db-manage --config-file /etc/neutron/neutron.conf \ | ||
152 | --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini upgrade head | ||
151 | } | 153 | } |
152 | 154 | ||
153 | pkg_postinst_${SRCNAME}-plugin-openvswitch-setup () { | 155 | 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 \ | |||
24 | file://nova.conf \ | 24 | file://nova.conf \ |
25 | file://openrc \ | 25 | file://openrc \ |
26 | " | 26 | " |
27 | SRCREV="e0331cfe9d49f25b8a23f5fc473f610415bb07ac" | 27 | SRCREV="e15ce7735e492f9eb0914efb621211e315ea40d9" |
28 | PV="2014.2.b1+git${SRCPV}" | 28 | PV="2014.2.b2+git${SRCPV}" |
29 | 29 | ||
30 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
31 | 31 | ||
@@ -304,6 +304,7 @@ RDEPENDS_${PN} = " libvirt \ | |||
304 | python-pbr \ | 304 | python-pbr \ |
305 | spice-html5 \ | 305 | spice-html5 \ |
306 | python-posix-ipc \ | 306 | python-posix-ipc \ |
307 | python-rfc3986 \ | ||
307 | " | 308 | " |
308 | 309 | ||
309 | RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ | 310 | 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 \ | |||
16 | file://cluster.conf \ | 16 | file://cluster.conf \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV="116ac459a64471b09a5e989e88349c66f470ce38" | 19 | SRCREV="8d02147d04a41477383de8e13bea6ac3fd2cade0" |
20 | PV="2.0.0+git${SRCPV}" | 20 | PV="2.1.0.rc1+git${SRCPV}" |
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit setuptools python-dir update-rc.d hosts identity | 23 | 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 \ | |||
14 | file://logging.conf \ | 14 | file://logging.conf \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRCREV="064e965b70190c2446a9355a5f5e83de0df5250e" | 17 | SRCREV="2707a0f065e52d8331d12c983ead95de1224cb32" |
18 | PV="2014.1+git${SRCPV}" | 18 | PV="2014.1+git${SRCPV}" |
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||