diff options
| -rw-r--r-- | fuel/build/Makefile | 8 | ||||
| -rw-r--r-- | fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp | 4 | ||||
| -rw-r--r-- | fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig | 4 | ||||
| -rw-r--r-- | fuel/build/fuel-main_3.patch | 11 | ||||
| -rw-r--r-- | fuel/build/fuel-main_4.patch | 23 |
5 files changed, 46 insertions, 4 deletions
diff --git a/fuel/build/Makefile b/fuel/build/Makefile index 5f63120..d3afe83 100644 --- a/fuel/build/Makefile +++ b/fuel/build/Makefile @@ -88,6 +88,14 @@ $(ISOCACHE): # Patch to make the sandbox chroot in Fuel succeed with package # installation in a Docker build cd /tmp/fuel-main && patch -p1 < $(TOPDIR)/fuel-main_2.patch + # Temporary patch to accomodate for new Ubuntu trusty devops keys not yet + # backported to fuel 6.0 or 6.1 + cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_3.patch + # Temporary patch for pidlockfile which was earlier part of python-daemon + # but in later pyhon versions is part of python-lockfile. This patch has + # not yet been backported to fuel 6.0 + cd /tmp/fuel-main/utils && patch -p0 < $(TOPDIR)/fuel-main_4.patch + # Remove Docker optimizations, otherwise multistrap will fail during # Fuel build. sudo rm -f /etc/apt/apt.conf.d/docker* diff --git a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp index 05cd9e0..1014056 100644 --- a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp +++ b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp @@ -279,8 +279,8 @@ class os_common { # keep four weekly log rotations, force rotate if 300M size have exceeded rotation => 'weekly', keep => '4', - # should be > 30M - limitsize => '300M', + minsize => '10M', + maxsize => '100M', # remote servers to send logs to rservers => $rservers, # should be true, if client is running at virtual node diff --git a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig index 9ed557a..cc05b3f 100644 --- a/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig +++ b/fuel/build/f_osnaily/puppet/modules/osnailyfacter/examples/site.pp.orig @@ -269,8 +269,8 @@ class os_common { # keep four weekly log rotations, force rotate if 300M size have exceeded rotation => 'weekly', keep => '4', - # should be > 30M - limitsize => '300M', + minsize => '10M', + maxsize => '100M', # remote servers to send logs to rservers => $rservers, # should be true, if client is running at virtual node diff --git a/fuel/build/fuel-main_3.patch b/fuel/build/fuel-main_3.patch new file mode 100644 index 0000000..b61c063 --- /dev/null +++ b/fuel/build/fuel-main_3.patch @@ -0,0 +1,11 @@ +--- prepare-build-env.sh.orig 2015-08-11 22:12:19.750626481 +0200 ++++ prepare-build-env.sh 2015-08-11 22:43:42.308300848 +0200 +@@ -43,7 +43,7 @@ + trusty) + GEMPKG="ruby ruby-dev" + # we need multistrap version 2.1.6, let's install it from devops mirror +- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D5A05778 ++ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 1D2B45A2 + echo "deb http://mirror.fuel-infra.org/devops/ubuntu/ ./" | sudo tee /etc/apt/sources.list.d/fuel-devops.list + # be sure, that we will not update multistrap in future + sudo tee /etc/apt/preferences.d/fuel-pin-300 <<EOF diff --git a/fuel/build/fuel-main_4.patch b/fuel/build/fuel-main_4.patch new file mode 100644 index 0000000..ba8a088 --- /dev/null +++ b/fuel/build/fuel-main_4.patch @@ -0,0 +1,23 @@ +--- simple_http_daemon.py.orig 2015-08-12 18:28:10.432593984 +0200 ++++ simple_http_daemon.py 2015-08-12 18:36:05.291038788 +0200 +@@ -18,7 +18,10 @@ + import os + import time + import daemon +-import daemon.pidlockfile ++try: ++ from daemon.pidlockfile import PIDLockFile ++except ImportError: ++ from lockfile.pidlockfile import PIDLockFile + import BaseHTTPServer + from SimpleHTTPServer import SimpleHTTPRequestHandler + +@@ -47,7 +50,7 @@ + context = daemon.DaemonContext( + working_directory=os.getcwd(), + umask=0o002, +- pidfile=daemon.pidlockfile.PIDLockFile(self.pid_file) ++ pidfile=PIDLockFile(self.pid_file) + ) + with context: + self.run_http_server() |