diff --git a/slapos/recipe/addresiliency/__init__.py b/slapos/recipe/addresiliency/__init__.py index 636635dbaed101741cff922a71f4a3c03e016272..69872e21453d6b943f49835f3b744509e88add8b 100644 --- a/slapos/recipe/addresiliency/__init__.py +++ b/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', diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index a6843a4c868da2c8aa051ecc998bfc18720207f4..3733deed61bf7a7ce3d6385bb60155c0cbfc0904 100644 --- a/stack/lamp/buildout.cfg +++ b/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 diff --git a/stack/lamp/instance-resilient.cfg b/stack/lamp/instance-resilient.cfg index 713573993c033375be896de3e8bd3e6553dec312..ce8d0de24e9e7a20a154dfe61818d9d64247ce38 100644 --- a/stack/lamp/instance-resilient.cfg +++ b/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") }} diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg index c86f40b113dca61a0102d43b551a130e94222a6d..9e1ead17ecd05985328eb489159e4eaca229e0da 100644 --- a/stack/resilient/buildout.cfg +++ b/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 diff --git a/stack/resilient/template-replicated.cfg b/stack/resilient/template-replicated.cfg index 831032669cda99a92a3c4a5b1f92ea3b1aa7034b..a2901cfa9dc68ed181c3a8aec1c77a3fa99a0940 100644 --- a/stack/resilient/template-replicated.cfg +++ b/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.