diff options
| author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-04-04 16:02:56 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-04-09 10:48:37 -0400 |
| commit | e7b4a0b965bb40861a487c13199755044919472a (patch) | |
| tree | 740373e9594abbadd846279582c596cc9e2607dd /meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch | |
| parent | c87a3d517bd49b1e915ba9bb3f20bfc86d239dbc (diff) | |
| download | meta-cloud-services-e7b4a0b965bb40861a487c13199755044919472a.tar.gz | |
python-nova: uprev to latest openstack sable/pike release
This requires several new recipes and package uprevs (python-tooz,
python-os-brick, python-pypowervm, python-networkx,
python-microversion-parse, python-os-win, python-os-vif, and
python-os-traits). Along with updates to make things work with
systemd.
We also take steps to make setup/init use the directions from
https://docs.openstack.org/nova/pike/install/controller-install-ubuntu.html
After these changes we can validate that nova is operating nominally
using the command:
+-------+--------------------------------------+
| Name | UUID |
+-------+--------------------------------------+
| cell0 | 00000000-0000-0000-0000-000000000000 |
| cell1 | f547fa04-7c82-4498-95ee-210fc40abdb6 |
+-------+--------------------------------------+
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch b/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch deleted file mode 100644 index 7893f87..0000000 --- a/meta-openstack/recipes-devtools/python/python-nova/nova-fix-location-to-doc-directory.patch +++ /dev/null | |||
| @@ -1,46 +0,0 @@ | |||
| 1 | From 4d74c926b8dd7eaac0c9ddac0d1161f634b69e1d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Keith Holman <Keith.Holman@windriver.com> | ||
| 3 | Date: Tue, 17 Jun 2014 16:40:51 -0400 | ||
| 4 | Subject: [PATCH] nova: fix location to doc directory | ||
| 5 | |||
| 6 | Currently, the tests included with nova expect the doc directory to be | ||
| 7 | in the location they exist in the source tree. However, during system | ||
| 8 | deployment the documentation is installed under the "nova" directory 1 | ||
| 9 | level higher in the directory tree. This patch fixes the relative | ||
| 10 | path to be able to find the files. | ||
| 11 | |||
| 12 | Signed-off-by: Keith Holman <Keith.Holman@windriver.com> | ||
| 13 | --- | ||
| 14 | nova/tests/integrated/api_samples_test_base.py | 2 +- | ||
| 15 | nova/tests/integrated/v3/api_sample_base.py | 2 +- | ||
| 16 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/nova/tests/integrated/api_samples_test_base.py b/nova/tests/integrated/api_samples_test_base.py | ||
| 19 | index 6acb5a1..31caa6c 100644 | ||
| 20 | --- a/nova/tests/integrated/api_samples_test_base.py | ||
| 21 | +++ b/nova/tests/integrated/api_samples_test_base.py | ||
| 22 | @@ -88,7 +88,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): | ||
| 23 | @classmethod | ||
| 24 | def _get_sample(cls, name): | ||
| 25 | dirname = os.path.dirname(os.path.abspath(__file__)) | ||
| 26 | - dirname = os.path.normpath(os.path.join(dirname, "../../../doc")) | ||
| 27 | + dirname = os.path.normpath(os.path.join(dirname, "../../doc")) | ||
| 28 | return cls._get_sample_path(name, dirname) | ||
| 29 | |||
| 30 | @classmethod | ||
| 31 | diff --git a/nova/tests/integrated/v3/api_sample_base.py b/nova/tests/integrated/v3/api_sample_base.py | ||
| 32 | index aa1ca8f..d22a2c8 100644 | ||
| 33 | --- a/nova/tests/integrated/v3/api_sample_base.py | ||
| 34 | +++ b/nova/tests/integrated/v3/api_sample_base.py | ||
| 35 | @@ -71,7 +71,7 @@ class ApiSampleTestBaseV3(api_samples_test_base.ApiSampleTestBase): | ||
| 36 | @classmethod | ||
| 37 | def _get_sample(cls, name): | ||
| 38 | dirname = os.path.dirname(os.path.abspath(__file__)) | ||
| 39 | - dirname = os.path.normpath(os.path.join(dirname, "../../../../doc/v3")) | ||
| 40 | + dirname = os.path.normpath(os.path.join(dirname, "../../../doc/v3")) | ||
| 41 | return cls._get_sample_path(name, dirname) | ||
| 42 | |||
| 43 | @classmethod | ||
| 44 | -- | ||
| 45 | 1.9.3 | ||
| 46 | |||
