Skip to content

slapos
slapos
Commit 7aa8db71 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

XXX honor expert.state

parent 350d0dee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
software/rapid-cdn/buildout.hash.cfg
View file @ 7aa8db71
...@@ -26,7 +26,7 @@ md5sum = 9c976e5f0184d20dfe0cbbb9416be1b3 ...@@ -26,7 +26,7 @@ md5sum = 9c976e5f0184d20dfe0cbbb9416be1b3
[profile-master] [profile-master]
filename = instance-master.cfg.in filename = instance-master.cfg.in
md5sum = bddf84b27d403fb6d5c3a969e78c43cb md5sum = 5890be9aa611e4fbe226c155ae6330f5
[profile-slave-list] [profile-slave-list]
filename = instance-slave-list.cfg.in filename = instance-slave-list.cfg.in
......
software/rapid-cdn/instance-master.cfg.in
View file @ 7aa8db71
...@@ -298,7 +298,7 @@ return = slave-instance-information-list monitor-base-url backend-client-csr-url ...@@ -298,7 +298,7 @@ return = slave-instance-information-list monitor-base-url backend-client-csr-url
<= replicate <= replicate
name = {{ frontend_node_name }} name = {{ frontend_node_name }}
software-url = {{ frontend_node_dict.pop('software-url', '') or instance_parameter_dict['slap-software-release-url'] }} software-url = {{ frontend_node_dict.pop('software-url', '') or instance_parameter_dict['slap-software-release-url'] }}
{%- set frontend_state = (frontend_node_dict.pop('state', '') or '').strip() %} {%- set frontend_state = frontend_node_dict.get('expert', {}).pop('state', '') %}
{%- if frontend_state %} {%- if frontend_state %}
state = {{ frontend_state }} state = {{ frontend_state }}
{%- endif %} {%- endif %}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7