Commit ccec64c7 authored by Benjamin Blanc's avatar Benjamin Blanc

Add instance ~propagation from root to others

parent ea851fbe
...@@ -250,7 +250,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 ...@@ -250,7 +250,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 16fc8b6907dcff36e2c47f11a0f2cd46 md5sum = e10f264ef99912f55b87344595928ee1
extra-context = extra-context =
key apache_location apache:location key apache_location apache:location
key aspell_location aspell:location key aspell_location aspell:location
...@@ -324,12 +324,12 @@ md5sum = 77ec4f095a22b5bd7dfea9dff63bade5 ...@@ -324,12 +324,12 @@ md5sum = 77ec4f095a22b5bd7dfea9dff63bade5
[template-erp5-cluster] [template-erp5-cluster]
< = download-base < = download-base
filename = instance-erp5-cluster.cfg.in filename = instance-erp5-cluster.cfg.in
md5sum = c745d794b28cae64feba527f894d7340 md5sum = 0b401bb15c1b2b6e346fe667e082b1bc
[template-scalability] [template-scalability]
< = download-base < = download-base
filename = instance-scalability.cfg.in filename = instance-scalability.cfg.in
md5sum = 31d49df000d7107f6bf81c592ed65f6d md5sum = 86562c997e9309f84405ada96c9ffbd5
[template-zeo] [template-zeo]
< = download-base < = download-base
......
...@@ -17,6 +17,7 @@ config = ...@@ -17,6 +17,7 @@ config =
${:extra-config} ${:extra-config}
extra-config = extra-config =
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
state = {{ root_instance_state }}
{% macro request(name, software_type, config_key, config={}, ret={'url': True}) -%} {% macro request(name, software_type, config_key, config={}, ret={'url': True}) -%}
{% do config.update(slapparameter_dict.get(config_key, {})) -%} {% do config.update(slapparameter_dict.get(config_key, {})) -%}
......
...@@ -40,6 +40,7 @@ config = {{ cluster_parameter_dict.keys() | join(' ') }} ...@@ -40,6 +40,7 @@ config = {{ cluster_parameter_dict.keys() | join(' ') }}
config-{{ key }} = {{ dumps(value) }} config-{{ key }} = {{ dumps(value) }}
{% endfor -%} {% endfor -%}
return = mariadb-url family-scalability family-user memcached-persistent-url memcached-volatile-url cloudooo-url return = mariadb-url family-scalability family-user memcached-persistent-url memcached-volatile-url cloudooo-url
state = {{ root_instance_state }}
# Create wrapper # Create wrapper
[binary-wrap-launcher] [binary-wrap-launcher]
......
...@@ -26,6 +26,7 @@ context = ...@@ -26,6 +26,7 @@ context =
key slap_software_type slap-configuration:slap-software-type key slap_software_type slap-configuration:slap-software-type
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
key computer_id slap-configuration:computer key computer_id slap-configuration:computer
key root_instance_state slap-configuration:instance-state
${:extra-context} ${:extra-context}
[dynamic-template-cloudooo-parameters] [dynamic-template-cloudooo-parameters]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment