Commit cf5fe2d2 authored by Xavier Thompson's avatar Xavier Thompson

stack/monitor: Enable monitor password promise

This reverts commit 51a16b0b.

Now that we have IPv6-range, this promise should not spuriously fail
inside testnodes anymore due to port conflicts between the monitors
of the tested SRs and the monitor of the testnode itself, since they
all have different IPv6s now.
parent 6e8b97ee
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = dda9b2355134517dae601cc20709685a md5sum = 3850140a4e61349cc64fa924ce410803
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
......
...@@ -423,9 +423,7 @@ depends = ...@@ -423,9 +423,7 @@ depends =
${ca-monitor-httpd-service:wrapper-path} ${ca-monitor-httpd-service:wrapper-path}
${monitor-httpd-promise:name} ${monitor-httpd-promise:name}
${monitor-frontend-promise:name} ${monitor-frontend-promise:name}
# XXX this is not enabled yet because this conflicts with testnode's own ${check-monitor-password-promise:name}
# monitoring.
# ${check-monitor-password-promise:name}
${monitor-bootstrap-promise:name} ${monitor-bootstrap-promise:name}
${monitor-symlink:recipe} ${monitor-symlink:recipe}
${promise-check-slapgrid:recipe} ${promise-check-slapgrid:recipe}
......
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