Commit 2ac91b79 authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Łukasz Nowak

kvm: fix cannot get monitor password with publish-early

parent abec1b0e
...@@ -23,7 +23,7 @@ md5sum = dc4dc40f9d950b5f963c22c62ca488a7 ...@@ -23,7 +23,7 @@ md5sum = dc4dc40f9d950b5f963c22c62ca488a7
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
md5sum = 4636f49f063a03f913f5e69c863c8ed35f62cf51 md5sum = 352f18067714501c8ccee55f8930d245
[template-kvm-resilient] [template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2 filename = instance-kvm-resilient.cfg.jinja2
......
...@@ -279,7 +279,7 @@ recipe = slapos.cookbook:publish-early ...@@ -279,7 +279,7 @@ recipe = slapos.cookbook:publish-early
monitor-httpd-port = 8060 monitor-httpd-port = 8060
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
username = admin username = admin
password = ${monitor-htpasswd:passwd} password = ${publish-early:monitor-password}
[monitor-base-url-dict] [monitor-base-url-dict]
{% for key, value in monitor_base_url_dict.items() -%} {% for key, value in monitor_base_url_dict.items() -%}
...@@ -292,6 +292,7 @@ private-path-list += ...@@ -292,6 +292,7 @@ private-path-list +=
[publish-connection-information] [publish-connection-information]
<= monitor-publish <= monitor-publish
-extends = publish-early
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
{% for name, value in publish_dict.items() -%} {% for name, value in publish_dict.items() -%}
{{ name }} = {{ value }} {{ name }} = {{ value }}
......
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