Commit 4636f49f authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Łukasz Nowak

software/kvm: Simply fetch monitor password

publish-early does not work in this case, and monitor password is stored
in buildout elsewhere anyway.
parent b6594e26
......@@ -23,7 +23,7 @@ md5sum = 857237f3de9fb42da919a7164a355e4f
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
md5sum = f8d00d8e18b6c1c32f8a7bffaee1cb30
md5sum = 69ed177fc30f9b5ca8ae497d840a888d
[template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2
......
......@@ -100,7 +100,7 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
config-disable-ansible-promise = {{ dumps(kvm_parameter_dict.get('disable-ansible-promise', False)) }}
config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
config-monitor-username = ${monitor-instance-parameter:username}
config-monitor-password = ${publish-early:monitor-password}
config-monitor-password = ${monitor-htpasswd:passwd}
# Enable disk wipe options
{% if kvm_parameter_dict.get('wipe-disk-ondestroy', False) -%}
config-wipe-disk-ondestroy = True
......@@ -256,11 +256,6 @@ mode = {{ mode }}
{{ writefile('cluster-data-content', '${directory:webroot}/${hash-code:passwd}/data', slapparameter_dict.get('cluster-data', ''), '700') }}
{% endif -%}
[publish-early]
recipe = slapos.cookbook:publish-early
-init =
monitor-password monitor-htpasswd:passwd
[monitor-instance-parameter]
monitor-httpd-port = 8060
cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
......
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