diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-02-13 17:09:52 +0100 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-02-17 16:22:42 +0100 |
| commit | ec0606c650706be7444370128624924a3dd1767e (patch) | |
| tree | c36e86482c38d119bd8a06301af47fb09bc3494a /fuel-build/patch-packages/python-nova/nova-console.patch | |
| parent | 41048f09b545b34ff1ed398b1dd76aad48a98718 (diff) | |
Update of Fuel based build system to Fuel 6.0.1
Rebase of the build system to build Fuel from the stable/6.0 branch
which currently creates Fuel 6.0.1. The Fuel baseline thus becomes:
- OpenStack Juno
- Ubuntu 12.04.4
- CentOS 6.5
An additional patch is added to the Fuel build system to enable
a newer version of Fuel to be built under Docker (as the Ubuntu
sandbox chroot is installing atd, where the post install expects
upstart to be running which is not the case in the build container).
Rebase of patches on top of Fuel to support 6.0.1.
Change-Id: I2e884d27e1533be8d60c071a7ea9db998a4f5fea
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel-build/patch-packages/python-nova/nova-console.patch')
| -rw-r--r-- | fuel-build/patch-packages/python-nova/nova-console.patch | 45 |
1 files changed, 28 insertions, 17 deletions
diff --git a/fuel-build/patch-packages/python-nova/nova-console.patch b/fuel-build/patch-packages/python-nova/nova-console.patch index a05af3b..fbc0318 100644 --- a/fuel-build/patch-packages/python-nova/nova-console.patch +++ b/fuel-build/patch-packages/python-nova/nova-console.patch @@ -1,17 +1,28 @@ ---- package/usr/share/pyshared/nova/virt/libvirt/driver.py.org -+++ package/usr/share/pyshared/nova/virt/libvirt/driver.py -@@ -3280,10 +3280,10 @@ - # client app is connected. Thus we can't get away - # with a single type=pty console. Instead we have - # to configure two separate consoles. -- consolelog = vconfig.LibvirtConfigGuestSerial() -- consolelog.type = "file" -- consolelog.source_path = self._get_console_log_path(instance) -- guest.add_device(consolelog) -+ #consolelog = vconfig.LibvirtConfigGuestSerial() -+ #consolelog.type = "file" -+ #consolelog.source_path = self._get_console_log_path(instance) -+ #guest.add_device(consolelog) - - consolepty = vconfig.LibvirtConfigGuestSerial() - consolepty.type = "pty" +*** package/usr/share/pyshared/nova/virt/libvirt/driver.py.orig 2015-02-16 14:19:53.203052869 +0100 +--- package/usr/share/pyshared/nova/virt/libvirt/driver.py 2015-02-16 14:22:53.065017671 +0100 +*************** +*** 3959,3968 **** + # client app is connected. Thus we can't get away + # with a single type=pty console. Instead we have + # to configure two separate consoles. +! consolelog = vconfig.LibvirtConfigGuestSerial() +! consolelog.type = "file" +! consolelog.source_path = self._get_console_log_path(instance) +! guest.add_device(consolelog) + + consolepty = vconfig.LibvirtConfigGuestSerial() + else: +--- 3959,3971 ---- + # client app is connected. Thus we can't get away + # with a single type=pty console. Instead we have + # to configure two separate consoles. +! # Disabled by OPNFV BEGIN +! # consolelog = vconfig.LibvirtConfigGuestSerial() +! # consolelog.type = "file" +! # consolelog.source_path = self._get_console_log_path(instance) +! # guest.add_device(consolelog) +! pass +! # Disabled by OPNFV END + + consolepty = vconfig.LibvirtConfigGuestSerial() + else: |