diff options
Diffstat (limited to 'meta-openstack')
13 files changed, 87 insertions, 51 deletions
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 \ | |||
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="d7f50d3161302b897febaf98243c7402abd5b156" | 18 | SRCREV="ada968e162d9795613bfb346a1018f63ef7025cc" |
19 | PV="2014.2.b2+git${SRCPV}" | 19 | PV="2014.2.b3+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 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 \ | |||
16 | # file://ceilometer-builtin-tests-config-location.patch | 16 | # file://ceilometer-builtin-tests-config-location.patch |
17 | 17 | ||
18 | 18 | ||
19 | SRCREV="fec77dbc85fed701fdbc3a96bae57e5ae3a705cb" | 19 | SRCREV="500388c3fe8be48be046908acd549f5e28608921" |
20 | PV="2014.2.b2+git${SRCPV}" | 20 | PV="2014.2.b3+git${SRCPV}" |
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | 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 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 \ | |||
20 | file://cinder-builtin-tests-config-location.patch \ | 20 | file://cinder-builtin-tests-config-location.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRCREV="ddcad011db507cde66b6b1e655d5ffc91ab8880f" | 23 | SRCREV="58eda5d1f41082a7e1ffef66239be30b8ac1321a" |
24 | PV="2014.2.b2+git${SRCPV}" | 24 | PV="2014.2.b3+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/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. | |||
10 | 10 | ||
11 | Signed-off-by: Vu Tran <vu.tran@windriver.com> | 11 | Signed-off-by: Vu Tran <vu.tran@windriver.com> |
12 | 12 | ||
13 | diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py | 13 | Index: git/glance/tests/functional/__init__.py |
14 | index 1256133..01adb81 100644 | 14 | =================================================================== |
15 | --- a/glance/tests/functional/__init__.py | 15 | --- git.orig/glance/tests/functional/__init__.py |
16 | +++ b/glance/tests/functional/__init__.py | 16 | +++ git/glance/tests/functional/__init__.py |
17 | @@ -900,7 +900,7 @@ class FunctionalTest(test_utils.BaseTestCase): | 17 | @@ -849,7 +849,7 @@ |
18 | return engine.execute(sql) | 18 | return engine.execute(sql) |
19 | 19 | ||
20 | def copy_data_file(self, file_name, dst_dir): | 20 | def copy_data_file(self, file_name, dst_dir): |
@@ -23,11 +23,11 @@ index 1256133..01adb81 100644 | |||
23 | shutil.copy(src_file_name, dst_dir) | 23 | shutil.copy(src_file_name, dst_dir) |
24 | dst_file_name = os.path.join(dst_dir, file_name) | 24 | dst_file_name = os.path.join(dst_dir, file_name) |
25 | return dst_file_name | 25 | return dst_file_name |
26 | diff --git a/glance/tests/unit/api/test_common.py b/glance/tests/unit/api/test_common.py | 26 | Index: git/glance/tests/unit/api/test_common.py |
27 | index 8892025..2aac6b7 100644 | 27 | =================================================================== |
28 | --- a/glance/tests/unit/api/test_common.py | 28 | --- git.orig/glance/tests/unit/api/test_common.py |
29 | +++ b/glance/tests/unit/api/test_common.py | 29 | +++ git/glance/tests/unit/api/test_common.py |
30 | @@ -137,7 +137,7 @@ class TestMalformedRequest(test_utils.BaseTestCase): | 30 | @@ -135,7 +135,7 @@ |
31 | super(TestMalformedRequest, self).setUp() | 31 | super(TestMalformedRequest, self).setUp() |
32 | self.config(flavor='', | 32 | self.config(flavor='', |
33 | group='paste_deploy', | 33 | group='paste_deploy', |
@@ -36,11 +36,11 @@ index 8892025..2aac6b7 100644 | |||
36 | self.api = config.load_paste_app('glance-api') | 36 | self.api = config.load_paste_app('glance-api') |
37 | 37 | ||
38 | def test_redirect_incomplete_url(self): | 38 | def test_redirect_incomplete_url(self): |
39 | diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py | 39 | Index: git/glance/tests/unit/base.py |
40 | index 4a19730..16ec103 100644 | 40 | =================================================================== |
41 | --- a/glance/tests/unit/base.py | 41 | --- git.orig/glance/tests/unit/base.py |
42 | +++ b/glance/tests/unit/base.py | 42 | +++ git/glance/tests/unit/base.py |
43 | @@ -76,7 +76,7 @@ class IsolatedUnitTest(StoreClearingUnitTest): | 43 | @@ -80,7 +80,7 @@ |
44 | registry=self.registry) | 44 | registry=self.registry) |
45 | 45 | ||
46 | def _copy_data_file(self, file_name, dst_dir): | 46 | def _copy_data_file(self, file_name, dst_dir): |
@@ -49,11 +49,11 @@ index 4a19730..16ec103 100644 | |||
49 | shutil.copy(src_file_name, dst_dir) | 49 | shutil.copy(src_file_name, dst_dir) |
50 | dst_file_name = os.path.join(dst_dir, file_name) | 50 | dst_file_name = os.path.join(dst_dir, file_name) |
51 | return dst_file_name | 51 | return dst_file_name |
52 | diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py | 52 | Index: git/glance/tests/unit/common/test_config.py |
53 | index 2dfede1..422a458 100644 | 53 | =================================================================== |
54 | --- a/glance/tests/unit/common/test_config.py | 54 | --- git.orig/glance/tests/unit/common/test_config.py |
55 | +++ b/glance/tests/unit/common/test_config.py | 55 | +++ git/glance/tests/unit/common/test_config.py |
56 | @@ -64,8 +64,7 @@ class TestPasteApp(test_utils.BaseTestCase): | 56 | @@ -63,8 +63,7 @@ |
57 | 57 | ||
58 | paste_to = temp_file.replace('.conf', '-paste.ini') | 58 | paste_to = temp_file.replace('.conf', '-paste.ini') |
59 | if not paste_config_file and make_paste_file: | 59 | if not paste_config_file and make_paste_file: |
@@ -63,22 +63,22 @@ index 2dfede1..422a458 100644 | |||
63 | _appendto(paste_from, paste_to, paste_append) | 63 | _appendto(paste_from, paste_to, paste_append) |
64 | 64 | ||
65 | app = config.load_paste_app('glance-registry') | 65 | app = config.load_paste_app('glance-registry') |
66 | @@ -90,8 +89,7 @@ class TestPasteApp(test_utils.BaseTestCase): | 66 | @@ -89,8 +88,7 @@ |
67 | paste_append=pipeline) | 67 | paste_append=pipeline) |
68 | 68 | ||
69 | def test_load_paste_app_with_paste_config_file(self): | 69 | def test_load_paste_app_with_paste_config_file(self): |
70 | - paste_config_file = os.path.join(os.getcwd(), | 70 | - paste_config_file = os.path.join(os.getcwd(), |
71 | - 'etc/glance-registry-paste.ini') | 71 | - 'etc/glance-registry-paste.ini') |
72 | + paste_config_file = '/etc/glance/glance-registry-paste.ini' | 72 | + paste_config_file = '/etc/glance/glance-registry-paste.ini' |
73 | expected_middleware = context.UnauthenticatedContextMiddleware | 73 | expected_middleware = osprofiler.web.WsgiMiddleware |
74 | self._do_test_load_paste_app(expected_middleware, | 74 | self._do_test_load_paste_app(expected_middleware, |
75 | paste_config_file=paste_config_file) | 75 | paste_config_file=paste_config_file) |
76 | diff --git a/glance/tests/utils.py b/glance/tests/utils.py | 76 | Index: git/glance/tests/utils.py |
77 | index 760824c..db598ba 100644 | 77 | =================================================================== |
78 | --- a/glance/tests/utils.py | 78 | --- git.orig/glance/tests/utils.py |
79 | +++ b/glance/tests/utils.py | 79 | +++ git/glance/tests/utils.py |
80 | @@ -67,7 +67,7 @@ class BaseTestCase(testtools.TestCase): | 80 | @@ -76,7 +76,7 @@ |
81 | self.config(property_protection_file=self.property_file) | 81 | property_utils.CONFIG.remove_section(section) |
82 | 82 | ||
83 | def _copy_data_file(self, file_name, dst_dir): | 83 | def _copy_data_file(self, file_name, dst_dir): |
84 | - src_file_name = os.path.join('glance/tests/etc', file_name) | 84 | - 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" | |||
8 | SRCNAME = "glance" | 8 | SRCNAME = "glance" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | 10 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ |
11 | file://0001-glance-store-only-load-known-stores-not-all-stores.patch \ | ||
12 | file://glance.init \ | 11 | file://glance.init \ |
13 | file://glance-change-builtin-tests-config-location.patch \ | 12 | file://glance-change-builtin-tests-config-location.patch \ |
14 | " | 13 | " |
15 | 14 | ||
16 | SRCREV="e66ecfee4eacfe25a18cd05d3f88e25c91fa112c" | 15 | # removed. juno uses store library: file://0001-glance-store-only-load-known-stores-not-all-stores.patch |
17 | PV="2014.2.b2+git${SRCPV}" | 16 | |
17 | SRCREV="7374d9347eeb6b354484984f06fd7e58fed50046" | ||
18 | PV="2014.2.b3+git${SRCPV}" | ||
18 | 19 | ||
19 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
20 | 21 | ||
@@ -177,6 +178,7 @@ RDEPENDS_${PN} += "python-greenlet \ | |||
177 | python-oslo.i18n \ | 178 | python-oslo.i18n \ |
178 | python-osprofiler \ | 179 | python-osprofiler \ |
179 | python-retrying \ | 180 | python-retrying \ |
181 | python-glancestore \ | ||
180 | " | 182 | " |
181 | 183 | ||
182 | RDEPENDS_${SRCNAME} = "${PN} \ | 184 | 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 \ | |||
16 | file://heat-tests-change-project_dir-path.patch \ | 16 | file://heat-tests-change-project_dir-path.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV="04de60093b602c2eac4a612df5d4a2e31424a25d" | 19 | SRCREV="9b700a1b6e1c806d8deba64ffb9a804790765678" |
20 | PV="2014.2.b2+git${SRCPV}" | 20 | PV="2014.2.b3+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 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 \ | |||
41 | python-xstatic-qunit \ | 41 | python-xstatic-qunit \ |
42 | python-xstatic-rickshaw \ | 42 | python-xstatic-rickshaw \ |
43 | python-xstatic-spin \ | 43 | python-xstatic-spin \ |
44 | python-xstatic-bootstrap-datepicker \ | ||
45 | python-xstatic-font-awesome \ | ||
44 | " | 46 | " |
45 | 47 | ||
46 | PR = "r2" | 48 | PR = "r2" |
@@ -54,8 +56,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | |||
54 | file://horizon-use-full-package-path-to-test-directories.patch \ | 56 | file://horizon-use-full-package-path-to-test-directories.patch \ |
55 | " | 57 | " |
56 | 58 | ||
57 | SRCREV="8f808a69f6f64c7d92571989b72da1d1801a1c86" | 59 | SRCREV="bd998fb6094fb16d084c90de1eed619aca4c31ef" |
58 | PV="2014.2.b2+git${SRCPV}" | 60 | PV="2014.2.b3+git${SRCPV}" |
59 | S = "${WORKDIR}/git" | 61 | S = "${WORKDIR}/git" |
60 | 62 | ||
61 | inherit setuptools update-rc.d python-dir default_configs | 63 | 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 \ | |||
16 | file://convert_keystone_backend.py \ | 16 | file://convert_keystone_backend.py \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV="dbede9c262168ff9ef9fd3b7f5ed2bc20ebd01f8" | 19 | SRCREV="73ad4036d62b3aa7cf50e11ddf7bee8278bbe4d0" |
20 | PV="2014.2.b2+git${SRCPV}" | 20 | PV="2014.2.b3+git${SRCPV}" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
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 = "\ | |||
11 | git://git.openstack.org/openstack/keystonemiddleware;branch=master \ | 11 | git://git.openstack.org/openstack/keystonemiddleware;branch=master \ |
12 | " | 12 | " |
13 | 13 | ||
14 | PV="1.0.0+git${SRCPV}" | 14 | PV="1.1.1+git${SRCPV}" |
15 | SRCREV="ce965ead938015cb7410f21141f5d76df4b3a0ce" | 15 | SRCREV="a4c13473aa09edee3c16733a4ff16f2cc206ad66" |
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
18 | inherit setuptools | 18 | 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 \ | |||
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="dca18ad307fdc9f33ab3421478c7fce373a1264d" | 23 | SRCREV="3cd2550f1bb20dbbc00a01d8dfd8b53e00baa00d" |
24 | PV="2014.2.b2+git${SRCPV}" | 24 | PV="2014.2.b3+git${SRCPV}" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
27 | 27 | ||
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 @@ | |||
1 | From 5f7ffa7f9eb0e35b8a18a6f0bf680149af174232 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Tue, 16 Sep 2014 15:14:15 -0400 | ||
4 | Subject: [PATCH] neutron/api: set default binding:vnic_type | ||
5 | |||
6 | Fix the following issue: https://bugs.launchpad.net/neutron/+bug/1370077, | ||
7 | by ensuring that if the backend driver doesn't set vnic_type, that the | ||
8 | default of VNIC_TYPE_NORMAL is used. | ||
9 | |||
10 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
11 | --- | ||
12 | nova/network/neutronv2/api.py | 3 +++ | ||
13 | 1 file changed, 3 insertions(+) | ||
14 | |||
15 | diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py | ||
16 | index 124640e1a275..67811788e1a4 100644 | ||
17 | --- a/nova/network/neutronv2/api.py | ||
18 | +++ b/nova/network/neutronv2/api.py | ||
19 | @@ -1361,6 +1361,9 @@ class API(base_api.NetworkAPI): | ||
20 | or current_neutron_port['status'] == 'ACTIVE'): | ||
21 | vif_active = True | ||
22 | |||
23 | + if not 'binding:vnic_type' in current_neutron_port: | ||
24 | + current_neutron_port['binding:vnic_type'] = network_model.VNIC_TYPE_NORMAL | ||
25 | + | ||
26 | network_IPs = self._nw_info_get_ips(client, | ||
27 | current_neutron_port) | ||
28 | subnets = self._nw_info_get_subnets(context, | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
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 \ | |||
16 | file://nova-convert-path-from-relative-to-absolute.patch \ | 16 | file://nova-convert-path-from-relative-to-absolute.patch \ |
17 | file://nova-fix-location-to-doc-directory.patch \ | 17 | file://nova-fix-location-to-doc-directory.patch \ |
18 | file://nova-fix-location-to-plugin-directory.patch \ | 18 | file://nova-fix-location-to-plugin-directory.patch \ |
19 | file://neutron-api-set-default-binding-vnic_type.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI += "file://nova-all \ | 22 | SRC_URI += "file://nova-all \ |
@@ -24,8 +25,8 @@ SRC_URI += "file://nova-all \ | |||
24 | file://nova.conf \ | 25 | file://nova.conf \ |
25 | file://openrc \ | 26 | file://openrc \ |
26 | " | 27 | " |
27 | SRCREV="e15ce7735e492f9eb0914efb621211e315ea40d9" | 28 | SRCREV="a5f09ddddfba65b8fdc6bac994750e5980b27521" |
28 | PV="2014.2.b2+git${SRCPV}" | 29 | PV="2014.2.b3+git${SRCPV}" |
29 | 30 | ||
30 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
31 | 32 | ||
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 \ | |||
16 | file://cluster.conf \ | 16 | file://cluster.conf \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV="8d02147d04a41477383de8e13bea6ac3fd2cade0" | 19 | SRCREV="d4da726f6f45187dc053578f11246d6b36679142" |
20 | PV="2.1.0.rc1+git${SRCPV}" | 20 | PV="2.1.0+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 |