Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos
Commits
6807c18f
Commit
6807c18f
authored
Sep 02, 2024
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XXX - checkpoint
parent
e376300c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
software/rapid-cdn/buildout.hash.cfg
software/rapid-cdn/buildout.hash.cfg
+2
-2
software/rapid-cdn/instance-master-publish-slave-information.cfg.in
...apid-cdn/instance-master-publish-slave-information.cfg.in
+1
-0
software/rapid-cdn/instance-master.cfg.in
software/rapid-cdn/instance-master.cfg.in
+6
-6
No files found.
software/rapid-cdn/buildout.hash.cfg
View file @
6807c18f
...
...
@@ -26,7 +26,7 @@ md5sum = d93042d602fb8d57e2bcc7691ca4807d
[profile-master]
filename = instance-master.cfg.in
md5sum =
d16bbec7562b3c8f6eb17d612b72215c
md5sum =
f6e83274dd2ed507b924fb2a8a14f703
[profile-slave-list]
filename = instance-slave-list.cfg.in
...
...
@@ -34,7 +34,7 @@ md5sum = 0634ebd7d884f0083d8fdf8ab2af08f2
[profile-master-publish-slave-information]
filename = instance-master-publish-slave-information.cfg.in
md5sum =
cba4d995962f7fbeae3f61c9372c4181
md5sum =
996a565cf45316450da8dfcab40916d4
[template-frontend-haproxy-configuration]
_update_hash_filename_ = templates/frontend-haproxy.cfg.in
...
...
software/rapid-cdn/instance-master-publish-slave-information.cfg.in
View file @
6807c18f
...
...
@@ -27,6 +27,7 @@
{% endfor %}
{% endfor %}
# XXX: {{ slave_information_dict }}
{% for slave_reference, rejected_info_list in rejected_slave_information['rejected-slave-dict'].items() %}
{% if slave_reference not in slave_information_dict %}
{% do slave_information_dict.__setitem__(slave_reference, {}) %}
...
...
software/rapid-cdn/instance-master.cfg.in
View file @
6807c18f
...
...
@@ -558,13 +558,13 @@ warning-slave-dict = {{ dumps(warning_slave_dict) }}
{% endfor %}
[active-slave-instance]
{% set active_slave_instance_list = [] %}
{% for slave_instance in instance_parameter_dict['slave-instance-list'] %}
{# Provide a list of slave titles send by master, in order to filter out already destroyed slaves #}
{%
-
set active_slave_instance_list = [] %}
{%
-
for slave_instance in instance_parameter_dict['slave-instance-list'] %}
{#
-
Provide a list of slave titles send by master, in order to filter out already destroyed slaves #}
{# Note: This functionality is not yet covered by tests, please modify with care #}
{% do active_slave_instance_list.append(slave_instance['slave_reference']) %}
{% endfor %}
{# sort_keys are important in order to avoid shuffling parameters on each run #}
{%
-
do active_slave_instance_list.append(slave_instance['slave_reference']) %}
{%
-
endfor %}
{#
-
sort_keys are important in order to avoid shuffling parameters on each run #}
active-slave-instance-list = {{ json_module.dumps(active_slave_instance_list, sort_keys=True) }}
[frontend-information]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment