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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos
Commits
326edbda
Commit
326edbda
authored
Sep 23, 2015
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: rename section run-ansible-monitor to monitor-kvm-ansible
parent
c2913c92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
8 deletions
+3
-8
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+2
-7
No files found.
software/kvm/common.cfg
View file @
326edbda
...
@@ -98,7 +98,7 @@ mode = 0644
...
@@ -98,7 +98,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
mode = 644
md5sum =
c6d616fc3922c28a502935963a00da2b
md5sum =
3e9d5e3c40f9c6c5e3dd690d524eb2f4
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
326edbda
...
@@ -47,7 +47,7 @@ parts =
...
@@ -47,7 +47,7 @@ parts =
# monitor-frontend-promise
# monitor-frontend-promise
cron-entry-logrotate
cron-entry-logrotate
monitor
monitor
run-ansible-monitor
monitor-kvm-ansible
start-monitor
start-monitor
ca-httpd
ca-httpd
monitor-promise
monitor-promise
...
@@ -356,7 +356,7 @@ template = {{ monitor_service_template_conf }}
...
@@ -356,7 +356,7 @@ template = {{ monitor_service_template_conf }}
rendered = ${monitor-directory:services-conf}/ansible-report.conf
rendered = ${monitor-directory:services-conf}/ansible-report.conf
name = ansible-report
name = ansible-report
title = kvm Ansible report
title = kvm Ansible report
executable-file =
${directory:scripts}/ansible-kvm-report
executable-file =
{{ ansible_report_script }}
context =
context =
key name :name
key name :name
key public_path_list monitor-symlink:public-path
key public_path_list monitor-symlink:public-path
...
@@ -371,11 +371,6 @@ status_path = ${monitor-directory:ansible-public}/status.json
...
@@ -371,11 +371,6 @@ status_path = ${monitor-directory:ansible-public}/status.json
public_folder = ${monitor-directory:ansible-public}
public_folder = ${monitor-directory:ansible-public}
private_folder = ${monitor-directory:ansible-private}
private_folder = ${monitor-directory:ansible-private}
[run-ansible-monitor]
recipe = slapos.cookbook:wrapper
command-line = python {{ ansible_report_script }} ${ansible-parameters-dict:status_path}
wrapper-path = ${monitor-kvm-ansible:executable-file}
[monitor-httpd-conf]
[monitor-httpd-conf]
port = 8026
port = 8026
...
...
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