Cleanup

Comments, trailing spaces, dead code

slapos/recipe/addresiliency/__init__.py

@@ -71,13 +71,6 @@ class Recipe(GenericSlapRecipe):
                                      bully_conf))
       path_list.append(script)
 
-      # for testing purposes only
-      scriptNew = self.createExecutable(path_bully_new,
-                                  self.substituteTemplate(
-                                  self.getTemplateFilename('bully_new.py.in'),
-                                  bully_conf))
-      path_list.append(scriptNew)
-
       wrapper = self.createPythonScript(
           path_run,
           'slapos.recipe.librecipe.execute.execute',

stack/lamp/buildout.cfg

@@ -2,9 +2,6 @@
 
 ignore-existing = true
 
-develop =
-  /opt/slapdev
-
 parts =
   apache-php
   mariadb
@@ -95,7 +92,7 @@ context = key templateapache template-apache-php:output
           key buildout buildout:bin-directory
 
 import-list = file parts template-parts:destination
-              file replicated template-replicated:destination 
+              file replicated template-replicated:destination
 
 md5sum = 2488daff81286a1b6be6dbc1ad3b0d7d
 mode = 0644

stack/lamp/instance-resilient.cfg

@@ -4,14 +4,13 @@
 [buildout]
 
 extends =
-#  ${template-resilient:output}
    {{templateapache}}
 
 parts =
   {{ parts.replicate("mariadb","3") }}
   request-apache-backup-1
   request-apache-backup-2
-  
+
   request-pull-backup-server-apache-1
   request-pull-backup-server-apache-backup-1
 
@@ -33,7 +32,7 @@ parts =
   dropbear-server-pbs-authorized-key
 
   request-pull-backup-server
-  
+
 {{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
 
 

stack/resilient/buildout.cfg

@@ -11,7 +11,6 @@ parts =
 #Frozen is the state used to not destroy a broken instance's content
   template-frozen
 
-#
   template-resilient
   template-switchsoftware
 

stack/resilient/template-replicated.cfg

@@ -103,7 +103,7 @@ config-number = {{id}}
 ## Adding a PBS provides resiliency
 ## Adding a backup server provides availability
 
-## Having 3 backups pulling from the same PBS provides 
+## Having 3 backups pulling from the same PBS provides
 ##only availability, not resiliency
 
 ## WARNING : SLAVES ARE ALLOCATED AT RANDOM, THIS NEEDS TO BE FIXED.