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

Revert "software/kvm: Simply fetch monitor password"

This reverts commit 4636f49f.
parent b99c54ef
......@@ -23,7 +23,7 @@ md5sum = dc4dc40f9d950b5f963c22c62ca488a7
[template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in
md5sum = c7ce0510c05753d428c18b756f827573
md5sum = 4636f49f063a03f913f5e69c863c8ed35f62cf51
[template-kvm-resilient]
filename = instance-kvm-resilient.cfg.jinja2
......
......@@ -108,7 +108,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 = ${monitor-htpasswd:passwd}
config-monitor-password = ${publish-early:monitor-password}
# Enable disk wipe options
{% if kvm_parameter_dict.get('wipe-disk-ondestroy', False) -%}
config-wipe-disk-ondestroy = True
......@@ -270,6 +270,11 @@ 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