Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kwabena Antwi-Boasiako
slapos
Commits
58eec840
Commit
58eec840
authored
Oct 04, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm-resilient: fix remove option to disable monitor
parent
570ec5f4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm-export.cfg.jinja2
software/kvm/instance-kvm-export.cfg.jinja2
+6
-6
No files found.
software/kvm/common.cfg
View file @
58eec840
...
@@ -143,7 +143,7 @@ recipe = hexagonit.recipe.download
...
@@ -143,7 +143,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm-export.cfg.jinja2
mode = 644
mode = 644
md5sum =
13387d37bbf430f1d2b827c8f1acc804
md5sum =
fbad91193be6ebde5fc4c05a38a55e7b
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm-export.cfg.jinja2
View file @
58eec840
...
@@ -34,8 +34,9 @@ context =
...
@@ -34,8 +34,9 @@ context =
# Extends publish section with resilient parameters
# Extends publish section with resilient parameters
[publish-connection-information]
[publish-connection-information]
<= resilient-publish-connection-parameter
<= resilient-publish-connection-parameter
monitor-base-url = ${monitor-publish:monitor-base-url}
monitor-setup-url = ${monitor-publish:monitor-setup-url}
{% if str(slapparameter_dict.get('enable-monitor', True)).lower() == 'true' -%}
[monitor-instance-parameter]
[monitor-instance-parameter]
monitor-httpd-port = 8026
monitor-httpd-port = 8026
monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
...
@@ -47,4 +48,3 @@ username = {{ slapparameter_dict['monitor-username'] }}
...
@@ -47,4 +48,3 @@ username = {{ slapparameter_dict['monitor-username'] }}
password = {{ slapparameter_dict['monitor-password'] }}
password = {{ slapparameter_dict['monitor-password'] }}
{% endif -%}
{% endif -%}
{% endif -%}
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