Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
2ac91b79
Commit
2ac91b79
authored
Oct 23, 2019
by
Alain Takoudjou
Committed by
Łukasz Nowak
Oct 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: fix cannot get monitor password with publish-early
parent
abec1b0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/instance-kvm-cluster.cfg.jinja2.in
software/kvm/instance-kvm-cluster.cfg.jinja2.in
+2
-1
No files found.
software/kvm/buildout.hash.cfg
View file @
2ac91b79
...
@@ -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
...
...
software/kvm/instance-kvm-cluster.cfg.jinja2.in
View file @
2ac91b79
...
@@ -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:passw
d}
password = ${
publish-early:monitor-passwor
d}
[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 }}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment