Commit 610c8f82 authored by Łukasz Nowak's avatar Łukasz Nowak

rapid-cdn: Fine tune promises

parent d9189dba
...@@ -22,15 +22,15 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68 ...@@ -22,15 +22,15 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
[profile-frontend] [profile-frontend]
filename = instance-frontend.cfg.in filename = instance-frontend.cfg.in
md5sum = 6af1b5abd03894ecc8d3c5aa46a76b10 md5sum = d93042d602fb8d57e2bcc7691ca4807d
[profile-master] [profile-master]
filename = instance-master.cfg.in filename = instance-master.cfg.in
md5sum = 33e92cfe3c35499dcd0095423d3c1b45 md5sum = 8c7f1bf5943e027cc6499361cad05c3b
[profile-slave-list] [profile-slave-list]
filename = instance-slave-list.cfg.in filename = instance-slave-list.cfg.in
md5sum = 96bd66e98c7b4492ab4aba46e0e14e13 md5sum = 4618b99e2b157f3bf60eece6b65936d2
[profile-master-publish-slave-information] [profile-master-publish-slave-information]
filename = instance-master-publish-slave-information.cfg.in filename = instance-master-publish-slave-information.cfg.in
...@@ -102,7 +102,7 @@ md5sum = e82ccdb0b26552a1c88ff523d8fae24a ...@@ -102,7 +102,7 @@ md5sum = e82ccdb0b26552a1c88ff523d8fae24a
[profile-kedifa] [profile-kedifa]
filename = instance-kedifa.cfg.in filename = instance-kedifa.cfg.in
md5sum = 107dc147d94d02d2084b97b8ec591831 md5sum = 7ce1ae2ec21a2aa385f16e406c6edc99
[template-frontend-haproxy-rsyslogd-conf] [template-frontend-haproxy-rsyslogd-conf]
_update_hash_filename_ = templates/frontend-haproxy-rsyslogd.conf.in _update_hash_filename_ = templates/frontend-haproxy-rsyslogd.conf.in
......
...@@ -630,6 +630,7 @@ promise = check_socket_listening ...@@ -630,6 +630,7 @@ promise = check_socket_listening
name = trafficserver-port-listening.py name = trafficserver-port-listening.py
config-host = ${trafficserver-variable:local-ip} config-host = ${trafficserver-variable:local-ip}
config-port = ${trafficserver-variable:input-port} config-port = ${trafficserver-variable:input-port}
config-report-anomaly = True
[trafficserver-ctl] [trafficserver-ctl]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -765,6 +766,7 @@ promise = check_socket_listening ...@@ -765,6 +766,7 @@ promise = check_socket_listening
name = frontend_haproxy_ipv4_https.py name = frontend_haproxy_ipv4_https.py
config-host = {{ instance_parameter_dict['ipv4-random'] }} config-host = {{ instance_parameter_dict['ipv4-random'] }}
config-port = ${configuration:port} config-port = ${configuration:port}
config-report-anomaly = True
[promise-frontend-haproxy-v4-http] [promise-frontend-haproxy-v4-http]
<= monitor-promise-base <= monitor-promise-base
...@@ -772,6 +774,7 @@ promise = check_socket_listening ...@@ -772,6 +774,7 @@ promise = check_socket_listening
name = frontend_haproxy_ipv4_http.py name = frontend_haproxy_ipv4_http.py
config-host = {{ instance_parameter_dict['ipv4-random'] }} config-host = {{ instance_parameter_dict['ipv4-random'] }}
config-port = ${configuration:plain_http_port} config-port = ${configuration:plain_http_port}
config-report-anomaly = True
[promise-frontend-haproxy-v6-https] [promise-frontend-haproxy-v6-https]
<= monitor-promise-base <= monitor-promise-base
...@@ -779,6 +782,7 @@ promise = check_socket_listening ...@@ -779,6 +782,7 @@ promise = check_socket_listening
name = frontend_haproxy_ipv6_https.py name = frontend_haproxy_ipv6_https.py
config-host = {{ instance_parameter_dict['ipv6-random'] }} config-host = {{ instance_parameter_dict['ipv6-random'] }}
config-port = ${configuration:port} config-port = ${configuration:port}
config-report-anomaly = True
[promise-frontend-haproxy-v6-http] [promise-frontend-haproxy-v6-http]
<= monitor-promise-base <= monitor-promise-base
...@@ -786,6 +790,7 @@ promise = check_socket_listening ...@@ -786,6 +790,7 @@ promise = check_socket_listening
name = frontend_haproxy_ipv6_http.py name = frontend_haproxy_ipv6_http.py
config-host = {{ instance_parameter_dict['ipv6-random'] }} config-host = {{ instance_parameter_dict['ipv6-random'] }}
config-port = ${configuration:plain_http_port} config-port = ${configuration:plain_http_port}
config-report-anomaly = True
[promise-backend-haproxy-http] [promise-backend-haproxy-http]
<= monitor-promise-base <= monitor-promise-base
...@@ -793,6 +798,7 @@ promise = check_socket_listening ...@@ -793,6 +798,7 @@ promise = check_socket_listening
name = backend_haproxy_http.py name = backend_haproxy_http.py
config-host = {{ instance_parameter_dict['ipv4-random'] }} config-host = {{ instance_parameter_dict['ipv4-random'] }}
config-port = ${backend-haproxy-configuration:http-port} config-port = ${backend-haproxy-configuration:http-port}
config-report-anomaly = True
[promise-backend-haproxy-https] [promise-backend-haproxy-https]
<= monitor-promise-base <= monitor-promise-base
...@@ -800,6 +806,7 @@ promise = check_socket_listening ...@@ -800,6 +806,7 @@ promise = check_socket_listening
name = backend_haproxy_https.py name = backend_haproxy_https.py
config-host = {{ instance_parameter_dict['ipv4-random'] }} config-host = {{ instance_parameter_dict['ipv4-random'] }}
config-port = ${backend-haproxy-configuration:https-port} config-port = ${backend-haproxy-configuration:https-port}
config-report-anomaly = True
[backend-haproxy-configuration] [backend-haproxy-configuration]
file = ${directory:etc}/backend-haproxy.cfg file = ${directory:etc}/backend-haproxy.cfg
...@@ -1028,6 +1035,7 @@ name = backend-haproxy-statistic-frontend.py ...@@ -1028,6 +1035,7 @@ name = backend-haproxy-statistic-frontend.py
config-http-code = 401 config-http-code = 401
config-url = config-url =
${backend-haproxy-statistic-frontend:connection-secure_access} ${backend-haproxy-statistic-frontend:connection-secure_access}
config-report-anomaly = True
[slave-introspection-configuration-state] [slave-introspection-configuration-state]
<= jinja2-template-base <= jinja2-template-base
...@@ -1096,6 +1104,7 @@ promise = check_socket_listening ...@@ -1096,6 +1104,7 @@ promise = check_socket_listening
name = slave_introspection_https.py name = slave_introspection_https.py
config-host = {{ instance_parameter_dict['ipv6-random'] }} config-host = {{ instance_parameter_dict['ipv6-random'] }}
config-port = ${frontend-configuration:slave-introspection-https-port} config-port = ${frontend-configuration:slave-introspection-https-port}
config-report-anomaly = True
[logrotate-entry-slave-introspection] [logrotate-entry-slave-introspection]
<= logrotate-entry-base <= logrotate-entry-base
...@@ -1127,6 +1136,7 @@ promise = check_file_state ...@@ -1127,6 +1136,7 @@ promise = check_file_state
name = ${:_buildout_section_name_}.py name = ${:_buildout_section_name_}.py
config-filename = ${logrotate-setup-validate:state-file} config-filename = ${logrotate-setup-validate:state-file}
config-state = empty config-state = empty
config-report-anomaly = True
[configuration] [configuration]
{%- for key, value in instance_parameter_dict.items() -%} {%- for key, value in instance_parameter_dict.items() -%}
......
...@@ -164,6 +164,7 @@ promise = check_socket_listening ...@@ -164,6 +164,7 @@ promise = check_socket_listening
name = expose-csr-ip-port-listening.py name = expose-csr-ip-port-listening.py
config-host = ${expose-csr-configuration:ip} config-host = ${expose-csr-configuration:ip}
config-port = ${expose-csr-configuration:port} config-port = ${expose-csr-configuration:port}
config-report-anomaly = True
[expose-csr] [expose-csr]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -227,6 +228,7 @@ name = kedifa-http-reply.py ...@@ -227,6 +228,7 @@ name = kedifa-http-reply.py
config-http-code = 400 config-http-code = 400
config-url = https://[${kedifa-config:ip}]:${kedifa-config:port} config-url = https://[${kedifa-config:ip}]:${kedifa-config:port}
config-ca-cert-file = ${kedifa-config:ca-certificate} config-ca-cert-file = ${kedifa-config:ca-certificate}
config-report-anomaly = True
[logrotate-entry-kedifa] [logrotate-entry-kedifa]
<= logrotate-entry-base <= logrotate-entry-base
...@@ -346,6 +348,7 @@ promise = check_file_state ...@@ -346,6 +348,7 @@ promise = check_file_state
name = ${:_buildout_section_name_}.py name = ${:_buildout_section_name_}.py
config-filename = ${logrotate-setup-validate:state-file} config-filename = ${logrotate-setup-validate:state-file}
config-state = empty config-state = empty
config-report-anomaly = True
[kedifa-auth-ready] [kedifa-auth-ready]
recipe = plone.recipe.command recipe = plone.recipe.command
...@@ -359,5 +362,8 @@ promise = check_file_state ...@@ -359,5 +362,8 @@ promise = check_file_state
name = ${:_buildout_section_name_}.py name = ${:_buildout_section_name_}.py
config-filename = ${kedifa-auth-ready:output} config-filename = ${kedifa-auth-ready:output}
config-state = empty config-state = empty
config-report-anomaly = True
config-failure-amount = 2
config-result-count = 2
{%- endif -%} {# if instance_parameter_dict['slap-software-type'] == software_type #} {%- endif -%} {# if instance_parameter_dict['slap-software-type'] == software_type #}
...@@ -501,6 +501,7 @@ promise = check_url_available ...@@ -501,6 +501,7 @@ promise = check_url_available
name = check-backend-haproxy-statistic-url-frontend-node-{{ index + 1 }}.py name = check-backend-haproxy-statistic-url-frontend-node-{{ index + 1 }}.py
config-url = config-url =
{{ section_part }}:connection-backend-haproxy-statistic-url} {{ section_part }}:connection-backend-haproxy-statistic-url}
config-report-anomaly = True
{% endfor %} {% endfor %}
#---------------------------- #----------------------------
...@@ -704,6 +705,7 @@ wrapper-path = ${directory:bin}/aikc-caucase-csr-sign-check ...@@ -704,6 +705,7 @@ wrapper-path = ${directory:bin}/aikc-caucase-csr-sign-check
promise = check_command_execute promise = check_command_execute
name = ${:_buildout_section_name_}.py name = ${:_buildout_section_name_}.py
config-command = ${aikc-sign-promise-wrapper:wrapper-path} config-command = ${aikc-sign-promise-wrapper:wrapper-path}
config-report-anomaly = True
{% for csr in frontend_list + ['kedifa'] %} {% for csr in frontend_list + ['kedifa'] %}
[aikc-{{ csr }}-wrapper] [aikc-{{ csr }}-wrapper]
...@@ -828,6 +830,7 @@ wrapper-path = ${directory:bin}/aibcc-caucase-csr-sign-check ...@@ -828,6 +830,7 @@ wrapper-path = ${directory:bin}/aibcc-caucase-csr-sign-check
promise = check_command_execute promise = check_command_execute
name = ${:_buildout_section_name_}.py name = ${:_buildout_section_name_}.py
config-command = ${aibcc-sign-promise-wrapper:wrapper-path} config-command = ${aibcc-sign-promise-wrapper:wrapper-path}
config-report-anomaly = True
{% for csr in frontend_list %} {% for csr in frontend_list %}
[aibcc-{{ csr }}-wrapper] [aibcc-{{ csr }}-wrapper]
...@@ -999,6 +1002,7 @@ promise = check_socket_listening ...@@ -999,6 +1002,7 @@ promise = check_socket_listening
name = master-introspection-server-ip-port-listening.py name = master-introspection-server-ip-port-listening.py
config-host = ${master-introspection-server-configuration:ip} config-host = ${master-introspection-server-configuration:ip}
config-port = ${master-introspection-server-configuration:port} config-port = ${master-introspection-server-configuration:port}
config-report-anomaly = True
[rejected-slave-promise] [rejected-slave-promise]
<= monitor-promise-base <= monitor-promise-base
...@@ -1007,6 +1011,9 @@ name = rejected-slave.py ...@@ -1007,6 +1011,9 @@ name = rejected-slave.py
config-filename = ${rejected-slave-json:output} config-filename = ${rejected-slave-json:output}
config-state = empty config-state = empty
config-url = ${rejected-slave-publish:url} config-url = ${rejected-slave-publish:url}
config-report-anomaly = False
config-failure-amount = 2
config-result-count = 2
[master-key-upload-url-ready] [master-key-upload-url-ready]
recipe = slapos.recipe.build recipe = slapos.recipe.build
...@@ -1029,6 +1036,7 @@ promise = check_file_state ...@@ -1029,6 +1036,7 @@ promise = check_file_state
name = ${:_buildout_section_name_}.py name = ${:_buildout_section_name_}.py
config-filename = ${master-key-upload-url-ready:output} config-filename = ${master-key-upload-url-ready:output}
config-state = empty config-state = empty
config-report-anomaly = True
[master-key-generate-auth-url-ready] [master-key-generate-auth-url-ready]
<= master-key-upload-url-ready <= master-key-upload-url-ready
...@@ -1037,6 +1045,7 @@ key = ${request-kedifa:connection-master-key-generate-auth-url} ...@@ -1037,6 +1045,7 @@ key = ${request-kedifa:connection-master-key-generate-auth-url}
[master-key-generate-auth-url-ready-promise] [master-key-generate-auth-url-ready-promise]
<= master-key-upload-url-ready-promise <= master-key-upload-url-ready-promise
config-filename = ${master-key-generate-auth-url-ready:output} config-filename = ${master-key-generate-auth-url-ready:output}
config-report-anomaly = True
[master-key-download-url-ready] [master-key-download-url-ready]
<= master-key-upload-url-ready <= master-key-upload-url-ready
...@@ -1045,6 +1054,7 @@ key = ${request-kedifa:connection-master-key-download-url} ...@@ -1045,6 +1054,7 @@ key = ${request-kedifa:connection-master-key-download-url}
[master-key-download-url-ready-promise] [master-key-download-url-ready-promise]
<= master-key-upload-url-ready-promise <= master-key-upload-url-ready-promise
config-filename = ${master-key-download-url-ready:output} config-filename = ${master-key-download-url-ready:output}
config-report-anomaly = True
[caucased-backend-client] [caucased-backend-client]
hash-existing-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
......
...@@ -640,6 +640,7 @@ promise = check_socket_listening ...@@ -640,6 +640,7 @@ promise = check_socket_listening
name = expose-csr-ip-port-listening.py name = expose-csr-ip-port-listening.py
config-host = ${expose-csr-configuration:ip} config-host = ${expose-csr-configuration:ip}
config-port = ${expose-csr-configuration:port} config-port = ${expose-csr-configuration:port}
config-report-anomaly = True
[expose-csr] [expose-csr]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
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