Merge remote-tracking branch 'upstream/master' into zope4py2

software/caddy-frontend/buildout.hash.cfg

@@ -22,19 +22,19 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-frontend]
 filename = instance-frontend.cfg.in
-md5sum = 1ec349747487b45dd6b30bb2aa45acbe
+md5sum = 7c966ea975cea4dcea09281466df8082
 
 [profile-master]
 filename = instance-master.cfg.in
-md5sum = 50dbd9bd25fbc608b576ac83f4e13b0f
+md5sum = cfd5212f27696311f12c92dfce32cc59
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
-md5sum = 5be5a32d5cf22e10967e59570dda2d36
+md5sum = aba91817a1b58377597500f676603d23
 
 [profile-master-publish-slave-information]
 filename = instance-master-publish-slave-information.cfg.in
-md5sum = b3422f3624054f57b78d0e50a0de399a
+md5sum = cba4d995962f7fbeae3f61c9372c4181
 
 [template-caddy-frontend-configuration]
 _update_hash_filename_ = templates/Caddyfile.in

software/caddy-frontend/instance-frontend.cfg.in

@@ -180,7 +180,6 @@ caddy-https-port = ${configuration:port}
 slave-introspection-configuration = ${directory:etc}/slave-introspection-httpd-nginx.conf
 slave-introspection-https-port = ${configuration:slave-introspection-https-port}
 slave-introspection-secure_access = ${slave-introspection-frontend:connection-secure_access}
-slave-introspection-domain = ${slave-introspection-frontend:connection-domain}
 
 [self-signed-ip-access]
 # Self Signed certificate for HTTPS IP accesses to the frontend
@@ -979,7 +978,7 @@ software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/a
 shared = true
 config-url = https://[${slap-configuration:ipv6-random}]:{{ instance_parameter_dict['configuration.slave-introspection-https-port'] }}/
 config-https-only = true
-return = domain secure_access
+return = secure_access
 
 [backend-haproxy-statistic-frontend]
 <= slap-connection

software/caddy-frontend/instance-master-publish-slave-information.cfg.in

@@ -52,6 +52,11 @@
 {%   endif %}
 {% endfor %}
 
+[common-frontend-information]
+{% for frontend_key, frontend_value in frontend_information.items() %}
+{{ frontend_key }} = {{ frontend_value }}
+{% endfor %}
+
 # Publish information for each slave
 {% set active_slave_instance_list = json_module.loads(active_slave_instance_dict['active-slave-instance-list']) %}
 {% for slave_reference, slave_information in slave_information_dict.items() %}
@@ -61,7 +66,9 @@
 {%     set publish_section_title = 'publish-%s' % slave_reference %}
 {%     do part_list.append(publish_section_title) %}
 [{{ publish_section_title }}]
-recipe = slapos.cookbook:publish
+<= common-frontend-information
+recipe = slapos.cookbook:publish_failsafe
+-error-status-file = {{ publish_failsafe_error }}/{{ slave_reference }}-error.status
 -slave-reference = {{ slave_reference }}
 {%     set log_access_url = slave_information.pop('log-access-urls', None) %}
 {%     if log_access_url %}
@@ -72,9 +79,6 @@ log-access-url = {{ dumps(json_module.dumps(log_access_url, sort_keys=True)) }}
 {{ key }} = {{ dumps(value) }}
 {%     endfor %}
 {%   endif %}
-{%   for frontend_key, frontend_value in frontend_information.items() %}
-{{ frontend_key }} = {{ frontend_value }}
-{%   endfor %}
 {% endfor %}
 
 [buildout]

software/caddy-frontend/instance-master.cfg.in

@@ -414,6 +414,7 @@ backend-client-caucase-url = {{ caucase_url }}
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 rejected-slave-dict = {{ dumps(json_module.dumps(rejected_slave_dict, sort_keys=True)) }}
 rejected-slave-promise-url = ${rejected-slave-promise:config-url}
+publish-failsafe-error-promise-url = ${publish-failsafe-error-promise:config-url}
 master-key-upload-url = ${request-kedifa:connection-master-key-upload-url}
 master-key-generate-auth-url = ${request-kedifa:connection-master-key-generate-auth-url}
 kedifa-caucase-url = ${request-kedifa:connection-caucase-url}
@@ -546,6 +547,7 @@ extra-context =
     section active_slave_instance_dict active-slave-instance
     section warning_slave_information warning-slave-information
     key slave_kedifa_information request-kedifa:connection-slave-kedifa-information
+    key publish_failsafe_error directory:publish-failsafe-error-var
 
 [monitor-base-url-dict]
 kedifa = ${request-kedifa:connection-monitor-base-url}
@@ -563,7 +565,10 @@ backup = ${:srv}/backup
 caucased = ${:srv}/caucased
 backup-caucased = ${:backup}/caucased
 # NGINX
-rejected-var = ${:var}/rejected-nginx
+master-introspection-var = ${:var}/master-introspection-nginx
+# slaves
+publish-failsafe-error-var = ${:var}/publish-failsafe-error
+publish-failsafe-check-var = ${:var}/publish-failsafe-check
 
 {% if aikc_enabled %}
 [directory]
@@ -829,27 +834,53 @@ context =
 service = ${:etc}/service
 promise-output = ${:srv}/promise-output
 
-[rejected-slave-publish-configuration]
+[master-introspection-server-configuration]
 ip = {{ instance_parameter_dict['ipv6-random'] }}
 port = 14455
 
-[rejected-slave-publish]
-directory = ${rejected-slave-json:directory}
-url = https://${rejected-slave-password:user}:${rejected-slave-password:passwd}@[${rejected-slave-publish-configuration:ip}]:${rejected-slave-publish-configuration:port}/${rejected-slave-json:filename}
+[master-introspection-server]
+ip = ${master-introspection-server-configuration:ip}
+port = ${master-introspection-server-configuration:port}
 recipe = slapos.cookbook:wrapper
 command-line = {{ software_parameter_dict['nginx'] }}
-  -c ${rejected-slave-template:output}
+  -c ${master-introspection-template:output}
 
-wrapper-path = ${directory:service}/rejected-slave-publish
+wrapper-path = ${directory:service}/master-introspection-server
 hash-existing-files =
   ${buildout:directory}/software_release/buildout.cfg
 hash-files =
-  ${rejected-slave-template:output}
-  ${rejected-slave-certificate:certificate}
+  ${master-introspection-template:output}
+  ${master-introspection-certificate:certificate}
+
+[master-introspection-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Master Introspection Frontend
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+shared = true
+config-url = https://[${master-introspection-server:ip}]:${master-introspection-server:port}/
+config-https-only = true
+return = secure_access
+
+[master-introspection-frontend-url]
+recipe = slapos.recipe.build
+url = ${master-introspection-frontend:connection-secure_access}
+user = ${master-introspection-password:user}
+password = ${master-introspection-password:passwd}
+init =
+  import furl
+  url = furl.furl(options['url'])
+  url.set(username = options['user'].lower())
+  url.set(password = options['password'])
+  url.set(path = '')
+  options['frontend-url'] = url.tostr()
 
-[rejected-slave-certificate]
+[rejected-slave-publish]
+url = ${master-introspection-frontend-url:frontend-url}/${master-introspection-template:rejected-slave-path}/${rejected-slave-json:filename}
+
+[master-introspection-certificate]
 recipe = plone.recipe.command
-certificate = ${directory:etc}/rejected-slave.pem
+certificate = ${directory:etc}/master-introspection.pem
 key = ${:certificate}
 
 {#- Can be stopped on error, as does not rely on self provided service #}
@@ -859,29 +890,31 @@ command =
   [ -f ${:certificate} ] && {{ software_parameter_dict['findutils'] }}/bin/find ${:certificate} -type f -mtime +3 -delete
   if ! [ -f ${:certificate} ] ; then
     openssl req -new -newkey rsa:2048 -sha256 -subj \
-      "/CN=${rejected-slave-publish-configuration:ip}" \
+      "/CN=${master-introspection-server-configuration:ip}" \
       -days 5 -nodes -x509 -keyout ${:certificate} -out ${:certificate}
   fi
 
-[rejected-slave-password]
+[master-introspection-password]
 recipe = slapos.cookbook:generate.password
-storage-path = ${directory:etc}/.rejected-slave.passwd
+storage-path = ${directory:etc}/.master-introspection.passwd
 bytes = 8
 user = admin
 
-[rejected-slave-htpasswd]
+[master-introspection-htpasswd]
 recipe = plone.recipe.command
 {#- Can be stopped on error, as does not rely on self provided service #}
 stop-on-error = True
-file = ${directory:var}/nginx-rejected.htpasswd
+file = ${directory:var}/master-introspection.htpasswd
 {#- update-command is not needed, as if the ${:password} would change, the whole part will be recalculated #}
-password = ${rejected-slave-password:passwd}
-command = {{ software_parameter_dict['htpasswd'] }} -cb ${:file} ${rejected-slave-password:user} ${:password}
+password = ${master-introspection-password:passwd}
+command = {{ software_parameter_dict['htpasswd'] }} -cb ${:file} ${master-introspection-password:user} ${:password}
 
-[rejected-slave-template]
+[master-introspection-template]
 recipe = slapos.recipe.template:jinja2
-var = ${directory:rejected-var}
-pid = ${directory:var}/nginx-rejected.pid
+var = ${directory:master-introspection-var}
+pid = ${directory:var}/nginx-master-introspection-server.pid
+rejected-slave-path = rejected-slave
+publish-failsafe-error-path = publish-failsafe-error
 inline =
   daemon off;
   pid ${:pid};
@@ -895,35 +928,40 @@ inline =
       port_in_redirect off;
       error_log stderr;
       access_log /dev/null;
-      listen [${rejected-slave-publish-configuration:ip}]:${rejected-slave-publish-configuration:port} ssl;
-      ssl_certificate ${rejected-slave-certificate:certificate};
-      ssl_certificate_key ${rejected-slave-certificate:certificate};
+      listen [${master-introspection-server-configuration:ip}]:${master-introspection-server-configuration:port} ssl;
+      ssl_certificate ${master-introspection-certificate:certificate};
+      ssl_certificate_key ${master-introspection-certificate:certificate};
       default_type application/octet-stream;
       client_body_temp_path ${:var} 1 2;
       proxy_temp_path ${:var} 1 2;
       fastcgi_temp_path ${:var} 1 2;
       uwsgi_temp_path ${:var} 1 2;
       scgi_temp_path ${:var} 1 2;
-
-      location / {
+      auth_basic "Master Introspection";
+      auth_basic_user_file ${master-introspection-htpasswd:file};
+      location /${:rejected-slave-path} {
         alias ${rejected-slave-json:directory}/;
         autoindex off;
         sendfile on;
         sendfile_max_chunk 1m;
-        auth_basic "Rejected slave template";
-        auth_basic_user_file ${rejected-slave-htpasswd:file};
+      }
+      location /${:publish-failsafe-error-path} {
+        alias ${check-publish-failsafe-error:directory}/;
+        autoindex off;
+        sendfile on;
+        sendfile_max_chunk 1m;
       }
     }
   }
 
-output = ${directory:etc}/nginx-rejected-slave.conf
+output = ${directory:etc}/nginx-master-introspection.conf
 
-[promise-rejected-slave-publish-ip-port]
+[master-introspection-server-ip-port]
 <= monitor-promise-base
 promise = check_socket_listening
-name = rejected-slave-publish-ip-port-listening.py
-config-host = ${rejected-slave-publish-configuration:ip}
-config-port = ${rejected-slave-publish-configuration:port}
+name = master-introspection-server-ip-port-listening.py
+config-host = ${master-introspection-server-configuration:ip}
+config-port = ${master-introspection-server-configuration:port}
 
 [rejected-slave-promise]
 <= monitor-promise-base
@@ -986,6 +1024,25 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
       key_len=2048
 )}}
 
+[check-publish-failsafe-error]
+recipe = plone.recipe.command
+directory = ${directory:publish-failsafe-check-var}
+filename = publish-failsafe-error.txt
+file = ${:directory}/${:filename}
+command = {{ software_parameter_dict['findutils'] }}/bin/find ${directory:publish-failsafe-error-var} -type f -printf "%f\n" > ${:file}
+update-command = ${:command}
+
+[check-publish-failsafe-error-publish]
+url = ${master-introspection-frontend-url:frontend-url}/${master-introspection-template:publish-failsafe-error-path}/${check-publish-failsafe-error:filename}
+
+[publish-failsafe-error-promise]
+<= monitor-promise-base
+promise = check_file_state
+name = publish-failsafe-error.py
+config-filename = ${check-publish-failsafe-error:file}
+config-state = empty
+config-url = ${check-publish-failsafe-error-publish:url}
+
 [buildout]
 extends =
   {{ software_parameter_dict['profile_common'] }}
@@ -993,15 +1050,18 @@ extends =
 parts =
   monitor-base
   publish-slave-information
+  check-publish-failsafe-error
+  publish-failsafe-error-promise
   publish-information
   request-kedifa
   rejected-slave-promise
-  promise-rejected-slave-publish-ip-port
+  master-introspection-server-ip-port
   caucased-backend-client
   caucased-backend-client-promise
   master-key-upload-url-ready-promise
   master-key-generate-auth-url-ready-promise
   master-key-download-url-ready-promise
+  master-introspection-frontend
 {% for part in part_list %}
 {{ '  %s' % part }}
 {% endfor %}

software/caddy-frontend/instance-slave-list.cfg.in

@@ -376,22 +376,12 @@ config-frequency = 720
 {%-   endif %}
 
 {#-   ###############################  #}
-{#-   Publish Slave Information        #}
-{%-   if not configuration['extra_slave_instance_list'] %}
-{%-     set publish_section_title = 'publish-%s-connection-information' % slave_instance.get('slave_reference') %}
-{%-     do part_list.append(publish_section_title) %}
-[{{ publish_section_title }}]
-recipe = slapos.cookbook:publish
-{%-     for key, value in slave_publish_dict.items() %}
-{{ key }} = {{ value }}
-{%-     endfor %}
-{%-   else %}
-{%-     do slave_instance_information_list.append(slave_publish_dict) %}
+{#-   Prepare Slave Information        #}
+{%-   do slave_instance_information_list.append(slave_publish_dict) %}
+{%-   do frontend_slave_list.append(slave_instance) %}
+{%-   if slave_type != 'redirect' %}
+{%-     do backend_slave_list.append(slave_instance) %}
 {%-   endif %}
-{%-  do frontend_slave_list.append(slave_instance) %}
-{%-  if slave_type != 'redirect' %}
-{%-    do backend_slave_list.append(slave_instance) %}
-{%-  endif %}
 {%- endfor %} {# Slave iteration ends for slave_instance in slave_instance_list #}
 
 {%- do part_list.append('slave-introspection') %}

software/caddy-frontend/test/test.py

@@ -442,12 +442,12 @@ class TestDataMixin(object):
           generateHashFromFiles([
             backend_haproxy_wrapper_path] + hash_file_list)
     for rejected_slave_publish_path in glob.glob(os.path.join(
-      self.instance_path, '*', 'etc', 'nginx-rejected-slave.conf')):
+      self.instance_path, '*', 'etc', 'nginx-master-introspection.conf')):
       partition_id = rejected_slave_publish_path.split('/')[-3]
       rejected_slave_pem_path = os.path.join(
-        self.instance_path, partition_id, 'etc', 'rejected-slave.pem')
+        self.instance_path, partition_id, 'etc', 'master-introspection.pem')
       data_replacement_dict[
-        '{hash-rejected-slave-publish}'
+        '{hash-master-introspection}'
       ] = generateHashFromFiles(
         [rejected_slave_publish_path, rejected_slave_pem_path] + hash_file_list
       )
@@ -955,6 +955,18 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
     with cls.slap.instance_supervisor_rpc as instance_supervisor:
       return getattr(instance_supervisor, method)(*args, **kwargs)
 
+  def assertPublishFailsafeErrorPromiseEmptyWithPop(self, parameter_dict):
+    promise_url = parameter_dict.pop(
+      'publish-failsafe-error-promise-url')
+
+    try:
+      result = requests.get(promise_url, verify=False)
+      self.assertEqual("", result.text)
+    except AssertionError:
+      raise
+    except Exception as e:
+      self.fail(e)
+
   def assertRejectedSlavePromiseEmptyWithPop(self, parameter_dict):
     rejected_slave_promise_url = parameter_dict.pop(
       'rejected-slave-promise-url')
@@ -1185,11 +1197,10 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
     return parsed_parameter_dict
 
   def getMasterPartitionPath(self):
-    # partition with etc/nginx-rejected-slave.conf
     return [
       q for q in glob.glob(os.path.join(self.instance_path, '*',))
       if os.path.exists(
-        os.path.join(q, 'etc', 'nginx-rejected-slave.conf'))][0]
+        os.path.join(q, 'etc', 'nginx-master-introspection.conf'))][0]
 
   def parseConnectionParameterDict(self):
     return self.parseParameterDict(
@@ -1461,6 +1472,7 @@ class TestMasterRequestDomain(HttpFrontendTestCase, TestDataMixin):
     self.assertKeyWithPop('monitor-setup-url', parameter_dict)
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
     self.assertNodeInformationWithPop(parameter_dict)
 
@@ -1493,6 +1505,7 @@ class TestMasterRequest(HttpFrontendTestCase, TestDataMixin):
     self.assertKeyWithPop('monitor-setup-url', parameter_dict)
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
     self.assertNodeInformationWithPop(parameter_dict)
     self.assertEqual(
@@ -1601,6 +1614,7 @@ class TestMasterAIKCDisabledAIBCCDisabledRequest(
     self.assertKeyWithPop('monitor-setup-url', parameter_dict)
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
     self.assertKeyWithPop('kedifa-csr-certificate', parameter_dict)
     self.assertKeyWithPop('kedifa-csr-url', parameter_dict)
@@ -2073,6 +2087,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
     self.assertKeyWithPop('monitor-setup-url', parameter_dict)
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
     self.assertNodeInformationWithPop(parameter_dict)
 
@@ -5169,6 +5184,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
     self.assertNodeInformationWithPop(parameter_dict)
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
 
     expected_parameter_dict = {
@@ -5676,6 +5692,7 @@ class TestSlaveSlapOSMasterCertificateCompatibilityUpdate(
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
     self.assertNodeInformationWithPop(parameter_dict)
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
 
     expected_parameter_dict = {
@@ -5768,6 +5785,7 @@ class TestSlaveCiphers(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
     self.assertNodeInformationWithPop(parameter_dict)
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseEmptyWithPop(parameter_dict)
 
     expected_parameter_dict = {
@@ -6035,6 +6053,7 @@ class TestSlaveRejectReportUnsafeDamaged(SlaveHttpFrontendTestCase):
     self.assertBackendHaproxyStatisticUrl(parameter_dict)
     self.assertKedifaKeysWithPop(parameter_dict, 'master-')
     self.assertNodeInformationWithPop(parameter_dict)
+    self.assertPublishFailsafeErrorPromiseEmptyWithPop(parameter_dict)
     self.assertRejectedSlavePromiseWithPop(parameter_dict)
 
     expected_parameter_dict = {

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test00supervisor_state.txt

@@ -2,9 +2,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestMasterAIKCDisabledAIBCCDisabledRequest.test_file_list_plugin.txt

@@ -3,13 +3,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestMasterRequest.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_plugin.txt

@@ -8,13 +8,14 @@ T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-2.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlave.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveHealthCheck.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveHostHaproxyClash.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test00supervisor_state.txt

@@ -4,9 +4,9 @@ T-0:bootstrap-monitor EXITED
 T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
 T-1:bootstrap-monitor EXITED
 T-1:caucase-updater-on-watch RUNNING
 T-1:caucased-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin.txt

@@ -7,13 +7,14 @@ T-0/etc/plugin/buildout-T-0-status.py
 T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
 T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
 T-0/etc/plugin/master-key-download-url-ready-promise.py
 T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
 T-0/etc/plugin/master-key-upload-url-ready-promise.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
 T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
+T-0/etc/plugin/publish-failsafe-error.py
 T-0/etc/plugin/rejected-slave.py
 T-1/etc/plugin/__init__.py
 T-1/etc/plugin/buildout-T-1-status.py

software/erp5/upgrade_test/test.py

@@ -46,7 +46,7 @@ from slapos.testing.testcase import (
   makeModuleSetUpAndTestCaseClass,
 )
 
-old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.6/software/erp5/software.cfg'
+old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.7/software/erp5/software.cfg'
 new_software_release_url = os.path.abspath(
   os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
 

software/ors-amarisoft/buildout.hash.cfg

@@ -24,23 +24,23 @@ md5sum = 6e0a052bd0ca08cc0c7b4880d3deffcc
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = da99546afedb6f443bfd767ab054763d
+md5sum = 833667743c693b8d5f78a2527b275a9e
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 689a1ace1f197663ff7c27c31862b275
+md5sum = ec127e2da004e52a516a7f499d7c7652
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 5455d0685f3bad94dbbdeaa772a7647f
+md5sum = 1f0b18cb6d70466d002b378bb931e7da
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = 7863ada6fe3062b7f62e61cb973fa0fc
+md5sum = 99c05a34678adb5a70aa64ecf2ee4e35
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 82674b93d0d7edb09fd85a8062a387bb
+md5sum = 58ee1663f86db0bbc4ccaf27831d2f0c
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
@@ -48,11 +48,11 @@ md5sum = 728f4d3ae248710c23e4b73eea4d628e
 
 [template-lte-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 8f2f6ff6f242546b2fef3bd559ba887d
+md5sum = 8888be35fa6e6f3e69d9373002a0e06e
 
 [template-lte-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = a8388fe893ad251bba929ef9047935a6
+md5sum = 94ca609dc564d7ed95db09e1fa029208
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg

software/ors-amarisoft/instance-enb-epc.jinja2.cfg

@@ -89,7 +89,9 @@ lte-enb-request =  ${lte-enb-request:connection-monitor-base-url}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -171,9 +171,9 @@ config-sdr = {{ sdr }}
 
 [cell-gain-saturated-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = 
-    slapos.core
-    python-dateutil
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cell_gain_saturated_promise }}
 output = ${directory:plugins}/check-cell-gain-saturated.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
@@ -182,9 +182,9 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
 [rx-saturated-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = 
-    slapos.core
-    python-dateutil
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ rx_saturated_promise }}
 output = ${directory:plugins}/check-rx-saturated.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
@@ -194,9 +194,9 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
 
 [amarisoft-stats-log-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = 
-    slapos.core
-    python-dateutil
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ amarisoft_stats_log_promise }}
 output = ${directory:plugins}/check-amarisoft-stats-log.py
 config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
@@ -204,7 +204,9 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/instance-epc.jinja2.cfg

@@ -78,7 +78,9 @@ lte-mme-request =  ${lte-mme-request:connection-monitor-base-url}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/instance-gnb-epc.jinja2.cfg

@@ -89,7 +89,9 @@ lte-gnb-request =  ${lte-gnb-request:connection-monitor-base-url}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/instance-gnb.jinja2.cfg

@@ -171,9 +171,9 @@ config-sdr = {{ sdr }}
 
 [cell-gain-saturated-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = 
-    slapos.core
-    python-dateutil
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cell_gain_saturated_promise }}
 output = ${directory:plugins}/check-cell-gain-saturated.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
@@ -182,9 +182,9 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
 [rx-saturated-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = 
-    slapos.core
-    python-dateutil
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ rx_saturated_promise }}
 output = ${directory:plugins}/check-rx-saturated.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
@@ -194,9 +194,9 @@ config-max-rx-sample-db = {{ slapparameter_dict.get("max_rx_sample_db", 0) }}
 
 [amarisoft-stats-log-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = 
-    slapos.core
-    python-dateutil
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ amarisoft_stats_log_promise }}
 output = ${directory:plugins}/check-amarisoft-stats-log.py
 config-amarisoft-stats-log = ${amarisoft-stats-template:log-output}
@@ -204,7 +204,9 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/instance-ue-lte.jinja2.cfg

@@ -132,7 +132,9 @@ config-sdr = {{ sdr }}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/instance-ue-nr.jinja2.cfg

@@ -135,7 +135,9 @@ config-sdr = {{ sdr }}
 
 [cpu-temperature-promise]
 recipe = slapos.cookbook:promise.plugin
-eggs = slapos.core
+eggs =
+  slapos.core
+  python-dateutil
 file = {{ cpu_temperature_promise }}
 output = ${directory:plugins}/check-cpu-temperature.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}

software/ors-amarisoft/software.cfg

@@ -117,7 +117,6 @@ filename = ue-nr.jinja2.cfg
 recipe = zc.recipe.egg
 eggs =
   websocket-client
-  python-dateutil
 interpreter = pythonwitheggs
 
 [versions]

stack/slapos.cfg

@@ -227,7 +227,7 @@ scandir = 1.10.0
 setproctitle = 1.1.10
 setuptools-dso = 1.7
 six = 1.16.0
-slapos.cookbook = 1.0.291
+slapos.cookbook = 1.0.297
 slapos.core = 1.8.5
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25