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
Alain Takoudjou
slapos
Commits
2862479c
Commit
2862479c
authored
Jan 25, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: really remove update route file when allow move is desabled
parent
cfb98fec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+4
-2
No files found.
software/kvm/common.cfg
View file @
2862479c
...
...
@@ -105,7 +105,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
md5sum =
bc1bf62c94a26c72a097f5fb589225f1
md5sum =
6744ae234158f878141d8328aec3568a
download-only = true
on-update = true
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
2862479c
...
...
@@ -14,6 +14,7 @@
{% set monitor = str(slapparameter_dict.get('enable-monitor', True)).lower() == 'true' -%}
{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
{% set allow_to_move = str(slapparameter_dict.get('allow-to-move-vm', True)).lower() == 'true' -%}
{% set sync_data_dir = '${directory:srv}/sync-data' -%}
{% set bootstrap_url = '' -%}
{% set bootstrap_url_md5sum = '' -%}
...
...
@@ -44,6 +45,7 @@ context =
section slapconnection_dict slap-connection
mode = 700
{% else -%}
{% set sync_data_dir = 'notfound' -%}
{% do part_list.append('cleanup-status-files') -%}
{% endif -%}
{% endif -%}
...
...
@@ -420,7 +422,7 @@ route-default = ip route add {{ global_ipv4_prefix }} via ${slap-network-informa
route-default =
{% endif -%}
command =
DATA_DIR=
${directory:srv}/sync-data
DATA_DIR=
{{ sync_data_dir }}
echo "#!/bin/sh" > ${:path}
echo "" >> ${:path}
if [ -s "$DATA_DIR/ipv4" ]; then
...
...
@@ -476,7 +478,7 @@ netmask =
network =
{% endif -%}
command =
DATA_DIR=
${directory:srv}/sync-data
DATA_DIR=
{{ sync_data_dir }}
BASE_DIR=${directory:public}
if [ -s "$DATA_DIR/ipv4" ]; then
IPv4=$(cat $DATA_DIR/ipv4)
...
...
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