Synnefo » snf-ganeti

From 49ee1838bffb5960e5e9bd59c0187d47203c2b44 Mon Sep 17 00:00:00 2001

From: Klaus Aehlig <aehlig@google.com>

Date: Mon, 3 Feb 2014 17:50:11 +0100

Subject: [PATCH] Fix specification of TIDiskParams

Commit 580b1fdd incorrectly assumes that disk parameters are

just the standard ones, whereas the man page explicitly states

that additional parameters can be passed as well, if they make

sense for the chosen storage type. Fix this.

Signed-off-by: Klaus Aehlig <aehlig@google.com>

Reviewed-by: Petr Pudlak <pudlak@google.com>

---

 lib/ht.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ht.py b/lib/ht.py

index d6171ac..ee82148 100644

--- a/lib/ht.py

+++ b/lib/ht.py

@@ -570,7 +570,7 @@ TINicParams = \

                                       TMaybe(TString)))

 TIDiskParams = \

-    Comment("Disk parameters")(TDictOf(TElemOf(constants.IDISK_PARAMS),

+    Comment("Disk parameters")(TDictOf(TNonEmptyString,

                                        TOr(TNonEmptyString, TInt)))

 THypervisor = TElemOf(constants.HYPER_TYPES)

-- 

1.9.0

From: Apollon Oikonomopoulos <apoikos@gmail.com>

Date: Fri, 12 Jul 2013 22:11:26 +0300

Subject: Disable local checks during build

check-local runs a series of tests clearly intended for the local developer's

machines that give false positives e.g. because of the presense of debian/.

Forwarded: no

Last-Update: 2013-07-12

---

 Makefile.in |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in

index 2936193..a1890e5 100644

--- a/Makefile.in

+++ b/Makefile.in

@@ -2571,7 +2571,7 @@ distcleancheck: distclean

 	       exit 1; } >&2

 check-am: all-am

 	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)

-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local

+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS

 check: check-am

 all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)

 installdirs:

Description: Remove obsolete ssconf files

  Debian packaging relies on obsolete ssconf files to detect whether the

  upgrade has completed or not; this is not needed for upstream,

  although it is a good cleanup

Author: Iustin Pop <iustin@debian.org>

Last-Update: 2010-10-24

--- a/tools/cfgupgrade12

+++ b/tools/cfgupgrade12

@@ -404,6 +404,10 @@

         logging.debug("Writing RAPI certificate to %s", options.RAPI_CERT_FILE)

         utils.GenerateSelfSignedSslCert(options.RAPI_CERT_FILE)

+      ss_hyp = SsconfName('hypervisor')

+      if os.path.exists(ss_hyp):

+        utils.RemoveFile(ss_hyp)

+

   except:

     logging.critical("Writing configuration failed. It is probably in an"

                      " inconsistent state and needs manual intervention.")

Description: The upgrade from Ganeti 1.2 makes the init script abort with

 ugly messages, so we edit the init script to exit early in this case.

Forwarded: no

Author: Iustin Pop <iusty@k1024.org>

Last-Update: 2009-12-04

--- a/doc/examples/ganeti.initd.in

+++ b/doc/examples/ganeti.initd.in

@@ -59,6 +59,16 @@

 }

 start_all() {

+    for fname in \

+        "@LOCALSTATEDIR@/lib/ganeti/ssconf_hypervisor"

+    do

+        if [ -f "$fname" ]; then

+            log_end_msg 0

+            log_warning_msg "Configuration not upgraded to 2.0, will not run."

+            exit 1

+        fi

+    done

+

     if ! $DAEMON_UTIL check-config; then

         log_warning_msg "Incomplete configuration, will not run."

         exit 0

Author: Apollon Oikonomopoulos <apoikos@gmail.com>

Description: Pass linker flags to GHC

 Enable hardening (relro) and as-needed

Forwarded: no

Last-Update: 2013-11-01

--- a/Makefile.in

+++ b/Makefile.in

@@ -801,6 +801,7 @@

 	-O -Wall -Werror -isrc \

 	-fwarn-monomorphism-restriction \

 	-fwarn-tabs \

+        -optl -Wl,-z,relro -optl -Wl,--as-needed \

 	$(GHC_BYVERSION_FLAGS)

fix-startup-with-old-config.patch

cfgupgrade12-remove-old-ssconf.patch

0003-Disable-local-checks-during-build.patch

pass-ghc-linker-flags.patch

0001-Fix-specification-of-TIDiskParams.patch