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/websocketproxy-allow-empty-schemes-at-python-2.7.3.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/websocketproxy-allow-empty-schemes-at-python-2.7.3.patch')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/websocketproxy-allow-empty-schemes-at-python-2.7.3.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/websocketproxy-allow-empty-schemes-at-python-2.7.3.patch b/meta-openstack/recipes-devtools/python/python-nova/websocketproxy-allow-empty-schemes-at-python-2.7.3.patch deleted file mode 100644 index e7ff9cb..0000000 --- a/meta-openstack/recipes-devtools/python/python-nova/websocketproxy-allow-empty-schemes-at-python-2.7.3.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From 0d727a196e2fe1e13956e2417b7a325be858b2db Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Wed, 5 Nov 2014 11:21:48 -0500 | ||
| 4 | Subject: [PATCH] websocketproxy: allow empty schemes at python 2.7.3 | ||
| 5 | |||
| 6 | The upstream project is concerned with a bug in empty schemes with | ||
| 7 | 2.7.3. But since Yocto is 2.7.3 and we get an empty scheme via websockify, | ||
| 8 | no VNC consoles are possible. | ||
| 9 | |||
| 10 | Rather than upreving python (big change), we aren't being hit by the | ||
| 11 | referenced bug, so we simply make sure that the condition can never | ||
| 12 | be true. | ||
| 13 | |||
| 14 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 15 | --- | ||
| 16 | nova/console/websocketproxy.py | 2 +- | ||
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/nova/console/websocketproxy.py b/nova/console/websocketproxy.py | ||
| 20 | index 4d32ff4328bb..85e3ab43293f 100644 | ||
| 21 | --- a/nova/console/websocketproxy.py | ||
| 22 | +++ b/nova/console/websocketproxy.py | ||
| 23 | @@ -45,7 +45,7 @@ class NovaProxyRequestHandlerBase(object): | ||
| 24 | # The nova expected behavior is to have token | ||
| 25 | # passed to the method GET of the request | ||
| 26 | parse = urlparse.urlparse(self.path) | ||
| 27 | - if parse.scheme not in ('http', 'https'): | ||
| 28 | + if parse.scheme not in ('http', 'https') and False: | ||
| 29 | # From a bug in urlparse in Python < 2.7.4 we cannot support | ||
| 30 | # special schemes (cf: http://bugs.python.org/issue9374) | ||
| 31 | if sys.version_info < (2, 7, 4): | ||
| 32 | -- | ||
| 33 | 1.9.1 | ||
| 34 | |||
