Commit 0502172c authored by Alain Takoudjou's avatar Alain Takoudjou

repman: fix request slave instance parameters

parent 3a1b4743
...@@ -18,7 +18,7 @@ md5sum = da50540b1c0fc69ffbf8f6e345a3baad ...@@ -18,7 +18,7 @@ md5sum = da50540b1c0fc69ffbf8f6e345a3baad
[instance-repman.cfg] [instance-repman.cfg]
_update_hash_filename_ = instance-repman.cfg.jinja2.in _update_hash_filename_ = instance-repman.cfg.jinja2.in
md5sum = 3d8199bbae01915267a441f47f25ef0d md5sum = 482c9f2cad5a35fd0e556dd353a0d39c
[config-toml.in] [config-toml.in]
_update_hash_filename_ = templates/config.toml.in _update_hash_filename_ = templates/config.toml.in
......
...@@ -457,8 +457,10 @@ password = ${publish-early:monitor-password} ...@@ -457,8 +457,10 @@ password = ${publish-early:monitor-password}
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Replication Manager Frontend name = Replication Manager Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = {{ frontend_parameter_dict.get('frontend-software-url', '') }} software-url = {{ frontend_parameter_dict.get('frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
software-type ={{ frontend_parameter_dict.get('frontend-software-type', '') }} {% if frontend_parameter_dict.get('frontend-software-type', '') -%}
software-type ={{ frontend_parameter_dict['frontend-software-type'] }}
{% endif -%}
slave = true slave = true
config-url = ${nginx-parameter:backend-ssl-url} config-url = ${nginx-parameter:backend-ssl-url}
config-domain = {{ frontend_parameter_dict.get('slave-domain', '') }} config-domain = {{ frontend_parameter_dict.get('slave-domain', '') }}
......
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