diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova-convert-path-from-relative-to-absolute.patch | 33 | ||||
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_git.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-convert-path-from-relative-to-absolute.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-convert-path-from-relative-to-absolute.patch new file mode 100644 index 0000000..0dba960 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-convert-path-from-relative-to-absolute.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From 8fbdaba5c172dd95c08a808a3ec12309461ffbdb Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Keith Holman <Keith.Holman@windriver.com> | ||
| 3 | Date: Tue, 17 Jun 2014 14:34:27 -0400 | ||
| 4 | Subject: [PATCH] nova: convert path from relative to absolute | ||
| 5 | |||
| 6 | Nova requires the configuration file "api-paste.ini". It is currently | ||
| 7 | installed to the "/etc/nova/" directory. Nova assumes that this | ||
| 8 | directory is accessible relative to the current location of source | ||
| 9 | files. This works if the files are stored in the source tree, | ||
| 10 | however, in deployment this doesn't work. This patch changes the path | ||
| 11 | to the absolute path on the deployed system. | ||
| 12 | |||
| 13 | Signed-off-by: Keith Holman <Keith.Holman@windriver.com> | ||
| 14 | --- | ||
| 15 | nova/tests/conf_fixture.py | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/nova/tests/conf_fixture.py b/nova/tests/conf_fixture.py | ||
| 19 | index f8e6dda..f8935f9 100644 | ||
| 20 | --- a/nova/tests/conf_fixture.py | ||
| 21 | +++ b/nova/tests/conf_fixture.py | ||
| 22 | @@ -48,7 +48,7 @@ class ConfFixture(fixtures.Fixture): | ||
| 23 | super(ConfFixture, self).setUp() | ||
| 24 | |||
| 25 | self.conf.set_default('api_paste_config', | ||
| 26 | - paths.state_path_def('etc/nova/api-paste.ini')) | ||
| 27 | + paths.state_path_def('/etc/nova/api-paste.ini')) | ||
| 28 | self.conf.set_default('host', 'fake-mini') | ||
| 29 | self.conf.set_default('compute_driver', 'nova.virt.fake.FakeDriver') | ||
| 30 | self.conf.set_default('fake_network', True) | ||
| 31 | -- | ||
| 32 | 1.9.3 | ||
| 33 | |||
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 510766b..a6d5fc8 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
| @@ -13,6 +13,7 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}" | |||
| 13 | 13 | ||
| 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ | 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/icehouse \ |
| 15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ | 15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ |
| 16 | file://nova-convert-path-from-relative-to-absolute.patch \ | ||
| 16 | " | 17 | " |
| 17 | 18 | ||
| 18 | SRC_URI += "file://nova-all \ | 19 | SRC_URI += "file://nova-all \ |
