summaryrefslogtreecommitdiffstats
path: root/fuel
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-05-13 09:28:49 +0200
committerJonas Bjurel <jonas.bjurel@ericsson.com>2015-05-13 10:50:39 +0200
commit0da5d47830c57ec6cea200f78d8df6a311692857 (patch)
tree4a250204d60d6cda607ed77c55f8984274cbccc4 /fuel
parent2e250b3c50723ba2da8c8b4d7a7b1f159a04663e (diff)
JIRA: -
Removed an old console-log patch wich disabled console logging and deemed not needed any longer. Change-Id: Iafb35f9a0a0060c5c7280b3319f48a6a003380c8 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel')
-rw-r--r--fuel/build/patch-packages/Makefile2
-rw-r--r--fuel/build/patch-packages/python-nova/Makefile29
-rw-r--r--fuel/build/patch-packages/python-nova/nova-console.patch28
3 files changed, 1 insertions, 58 deletions
diff --git a/fuel/build/patch-packages/Makefile b/fuel/build/patch-packages/Makefile
index bcaac36..5d7d200 100644
--- a/fuel/build/patch-packages/Makefile
+++ b/fuel/build/patch-packages/Makefile
@@ -8,7 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-SUBDIRS := python-nova debootstrap
+SUBDIRS := debootstrap
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
.PHONY: $(SUBDIRS) $(SUBCLEAN) clean
diff --git a/fuel/build/patch-packages/python-nova/Makefile b/fuel/build/patch-packages/python-nova/Makefile
deleted file mode 100644
index fbf5fb4..0000000
--- a/fuel/build/patch-packages/python-nova/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-TOP := $(shell pwd)
-
-.PHONY: all
-all:
-
-.PHONY: clean
-clean:
- @rm -rf package
- @rm -rf *.deb
- @rm -rf patch-replacements
- @rm -rf .package
-
-.PHONY: release
-release:
- ../tools/deb_unpack python-nova_*.deb $(ORIGISO)
- patch -s -p0 < nova-console.patch
- ../tools/deb_pack $(REVSTATE)
- @cp *.deb ../release/packages
- @cat patch-replacements >> ../release/patch-replacements
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 d5b3853..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: