stack/lamp: prefix the name of the instance with the root instance's title

stack/lamp/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [lamp-instance]
 filename = instance.cfg.in
-md5sum = f34548ba607becf3acd5c5e3d8e70551
+md5sum = 663d65b8ae91f3db718a584e9e6bb4a5
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
@@ -22,7 +22,7 @@ md5sum = 41602a61d5f9609281dbfa3f27da0626
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
-md5sum = de1f450a80547d12334b712016138078
+md5sum = f4081a8aabbb75faf5fd00ac2e0e7810
 
 [template-apache.conf]
 filename = apache.conf.in

stack/lamp/instance-lamp.cfg.jinja2.in

@@ -20,7 +20,7 @@ partition-id = ${slap-connection:partition-id}
 [request-apache]
 <= request-common
 software-type = apache
-name = apache-php
+name = {{ instance_title }}_apache-php
 sla-computer_guid = {{ dumps(slapparameter_dict.get('apache-computer-guid', '')) }}
 {% for key, value in slapparameter_dict.items() -%}
 {%  if key.startswith('instance.') -%}
@@ -42,7 +42,7 @@ return =
 [request-mariadb]
 <= request-common
 software-type = mariadb
-name = Mariadb
+name = {{ instance_title }}_Mariadb
 sla-computer_guid = {{ dumps(slapparameter_dict.get('mariadb-computer-guid', '')) }}
 config-database-list = {{ dumps([{'name': db_name, 'user': db_user, 'password': db_password }]) }}
 config-test-database-amount = {{ dumps(0) }}

stack/lamp/instance.cfg.in

@@ -32,6 +32,7 @@ context =
   key ipv4 slap-configuration:ipv4
   key ipv6 slap-configuration:ipv6
   key slapparameter_dict slap-configuration:configuration
+  key instance_title slap-configuration:instance-title
   key computer_id slap-configuration:computer
   raw template_monitor {{ template_monitor }}
   raw openssl_location {{ openssl_location }}