diff options
4 files changed, 15 insertions, 34 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch deleted file mode 100644 index 25aa07e..0000000 --- a/meta-openstack/recipes-devtools/python/python-nova/nova-add-migrate.cfg-to-the-MANIFEST.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From 019f6c2d838aefa9b625bd7a5eadb031fca735cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Mon, 27 Jan 2014 16:06:16 -0500 | ||
4 | Subject: [PATCH] nova: add migrate.cfg to the MANIFEST | ||
5 | |||
6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
7 | --- | ||
8 | MANIFEST.in | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/MANIFEST.in b/MANIFEST.in | ||
12 | index c978a52dae21..61e522c610d6 100644 | ||
13 | --- a/MANIFEST.in | ||
14 | +++ b/MANIFEST.in | ||
15 | @@ -1,5 +1,6 @@ | ||
16 | include AUTHORS | ||
17 | include ChangeLog | ||
18 | +include nova/db/sqlalchemy/migrate_repo/migrate.cfg | ||
19 | exclude .gitignore | ||
20 | exclude .gitreview | ||
21 | |||
22 | -- | ||
23 | 1.7.10.4 | ||
24 | |||
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf index fe4d756..1082f11 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf +++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | [DEFAULT] | 1 | [DEFAULT] |
2 | # firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver | 2 | # firewall_driver = nova.virt.libvirt.firewall.IptablesFirewallDriver |
3 | firewall_driver = nova.virt.firewall.NoopFirewallDriver | 3 | firewall_driver = nova.virt.firewall.NoopFirewallDriver |
4 | compute_driver = libvirt.LibvirtDriver | 4 | compute_driver = nova.virt.libvirt.LibvirtDriver |
5 | default_floating_pool = public | 5 | default_floating_pool = public |
6 | fixed_range = | 6 | fixed_range = |
7 | force_dhcp_release = True | 7 | force_dhcp_release = True |
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 0bc5d03..fd50173 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
@@ -10,8 +10,7 @@ SRCNAME = "nova" | |||
10 | 10 | ||
11 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}" | 11 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}" |
12 | 12 | ||
13 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/kilo \ | 13 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ |
14 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ | ||
15 | file://neutron-api-set-default-binding-vnic_type.patch \ | 14 | file://neutron-api-set-default-binding-vnic_type.patch \ |
16 | " | 15 | " |
17 | # restore post stable/juno: | 16 | # restore post stable/juno: |
@@ -26,8 +25,8 @@ SRC_URI += "file://nova-all \ | |||
26 | file://nova.conf \ | 25 | file://nova.conf \ |
27 | file://openrc \ | 26 | file://openrc \ |
28 | " | 27 | " |
29 | SRCREV = "8397b6464af520903f546ce4c6d51a2eb5b4c8a8" | 28 | SRCREV = "6df6ad3ff32f2b1fe2978df1032002548ad8eb66" |
30 | PV = "2015.1.0+git${SRCPV}" | 29 | PV = "12.0.0+git${SRCPV}" |
31 | 30 | ||
32 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
33 | 32 | ||
@@ -312,7 +311,7 @@ RDEPENDS_${PN} = " libvirt \ | |||
312 | python-sqlalchemy \ | 311 | python-sqlalchemy \ |
313 | python-sqlalchemy-migrate \ | 312 | python-sqlalchemy-migrate \ |
314 | python-stevedore \ | 313 | python-stevedore \ |
315 | python-suds \ | 314 | python-suds-jurko \ |
316 | python-neutronclient \ | 315 | python-neutronclient \ |
317 | python-routes \ | 316 | python-routes \ |
318 | python-webob \ | 317 | python-webob \ |
@@ -325,6 +324,14 @@ RDEPENDS_${PN} = " libvirt \ | |||
325 | python-sqlparse \ | 324 | python-sqlparse \ |
326 | python-netifaces \ | 325 | python-netifaces \ |
327 | python-retrying \ | 326 | python-retrying \ |
327 | python-debtcollector \ | ||
328 | python-ecdsa \ | ||
329 | python-wrapt \ | ||
330 | python-oslo.versionedobjects \ | ||
331 | python-oslo.reports \ | ||
332 | python-monotonic \ | ||
333 | python-oslo.service \ | ||
334 | python-os-brick \ | ||
328 | " | 335 | " |
329 | 336 | ||
330 | RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ | 337 | RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \ |
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb index d8d7168..a2775ec 100644 --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb | |||
@@ -4,15 +4,13 @@ SECTION = "devel/python" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669" |
6 | 6 | ||
7 | PR = "r0" | ||
8 | |||
9 | SRC_URI = "\ | 7 | SRC_URI = "\ |
10 | git://github.com/openstack/python-novaclient.git;branch=master \ | 8 | git://github.com/openstack/python-novaclient.git;branch=master \ |
11 | file://nova-api-check.sh \ | 9 | file://nova-api-check.sh \ |
12 | " | 10 | " |
13 | 11 | ||
14 | PV = "2.23.0+git${SRCPV}" | 12 | PV = "2.33.0+git${SRCPV}" |
15 | SRCREV = "e0f5072907a00d48a183dd8fc91a6cf6038ca279" | 13 | SRCREV = "a5363ae0d60d41feff23f6cca44fcd7aa9fc5b8b" |
16 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
17 | 15 | ||
18 | inherit setuptools monitor rmargparse | 16 | inherit setuptools monitor rmargparse |