Request mariadb instance on same machine as Apache instance

9ecd5152 · Cédric de Saint Martin · 31349577 · 9ecd5152 · 9ecd5152
Commit 9ecd5152 authored Sep 11, 2012 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

stack/lamp/buildout.cfg stack/lamp/buildout.cfg +2 -2

stack/lamp/instance-apache-php.cfg stack/lamp/instance-apache-php.cfg +2 -0

No files found.
--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -66,7 +66,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-php.cfg
 output = ${buildout:directory}/template-apache-php.cfg
-md5sum = 159c5326e6faff2ba9c1f52b113c01fa
+md5sum = 59cee571ea0fcdf2e6c9b3195e258738
 mode = 0644
 [template-apache-backup]
@@ -87,7 +87,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
 output = ${buildout:directory}/template-mariadb.cfg
-md5sum = 767452bc503ff6c1b7af0ebfac590c9f   
+md5sum = 767452bc503ff6c1b7af0ebfac590c9f
 mode = 0644
 [template-mariadb-pbsready]

--- a/stack/lamp/instance-apache-php.cfg
+++ b/stack/lamp/instance-apache-php.cfg
@@ -106,6 +106,8 @@ name = MariaDB
 software-url = $${slap-connection:software-release-url}
 software-type = mariadb
 return = url
+sla = computer_guid
+sla-computer_guid = ${slap-connection:computer-id}
 [mariadb-urlparse]
 recipe = slapos.cookbook:urlparse