diff --git a/software/kvm/buildout.hash.cfg b/software/kvm/buildout.hash.cfg index faf45f19ba11b4339be310ff67b0248aebc1e835..50ee0674ab51bd61894bb3e867e5cd71c7a7dc80 100644 --- a/software/kvm/buildout.hash.cfg +++ b/software/kvm/buildout.hash.cfg @@ -23,7 +23,7 @@ md5sum = 857237f3de9fb42da919a7164a355e4f [template-kvm-cluster] filename = instance-kvm-cluster.cfg.jinja2.in -md5sum = 2bbee46d39aec87e92c8462efab292b6 +md5sum = f8d00d8e18b6c1c32f8a7bffaee1cb30 [template-kvm-resilient] filename = instance-kvm-resilient.cfg.jinja2 diff --git a/software/kvm/instance-kvm-cluster.cfg.jinja2.in b/software/kvm/instance-kvm-cluster.cfg.jinja2.in index eaa8ce6b513044a50db006ff1aba480019167998..07493ec2b6f83df620ae3aff1c2b89d7942964da 100644 --- a/software/kvm/instance-kvm-cluster.cfg.jinja2.in +++ b/software/kvm/instance-kvm-cluster.cfg.jinja2.in @@ -277,14 +277,11 @@ private-path-list += ${directory:webroot}/ [publish-connection-information] +<= monitor-publish recipe = slapos.cookbook:publish {% for name, value in publish_dict.items() -%} {{ name }} = {{ value }} {% endfor %} -{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%} -monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${monitor-publish-parameters:monitor-password} -monitor-password = ${publish-early:monitor-password} -monitor-user = ${monitor-publish-parameters:monitor-user} {% do part_list.append('monitor-base') -%} [buildout]