diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-02 22:46:45 +0100 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-09 23:00:13 +0100 |
| commit | 6cb518c68eb136ad448e96716ef8b1348440949f (patch) | |
| tree | 757551a8efdc4e85e19fc1b0f27555825580e5c9 /fuel-build/patch-packages/python-nova/nova-console.patch | |
| parent | 1e106bbaca2780c10bd02b4e5fa3702d36acdf39 (diff) | |
Starting point for ODL Integration
***CAN BE MERGED***
- ODL build and installation (puppet manifests) including needed dependencies
- Modified in accordance with Randy Levensalors comments
- Added chmod 4755 /bin/fusermount due to that lately some systems dont install fuseiso
withe SUID set for fusermount. Investing ongoing on why and why not consistent.
- Rebased with master
- ODL disabled in top Make (enable it by uncommenting the odl dirs
- Removed white spaces
- Hopefully fixed an issue with the docker ubuntu repos, added --no-cache=true to the fuel/docker/Make file.
TODO:
- Refactor collecting ODL and Java dependencies to one common place
- Refactoring top Makefile
- Adding CI hooks for build and deploy
- Finishing integration plumbing wit Neutron/ML2 and OVS/OVSDB
Change-Id: I13dd4d3a72d099316dfaa9f7cd9140781be2397b
Signed-off-by: Jonas Bjurel <jonas.bjurel@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 | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/fuel-build/patch-packages/python-nova/nova-console.patch b/fuel-build/patch-packages/python-nova/nova-console.patch deleted file mode 100644 index fbc0318..0000000 --- a/fuel-build/patch-packages/python-nova/nova-console.patch +++ /dev/null @@ -1,28 +0,0 @@ -*** 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: |