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
isaak yansane-sisk
slapos
Commits
741a844a
Commit
741a844a
authored
Jan 22, 2015
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: use $HOME always in import script.
parent
6ad02f35
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/template/runner-import.sh.jinja2
software/slaprunner/template/runner-import.sh.jinja2
+3
-3
No files found.
software/slaprunner/common.cfg
View file @
741a844a
...
@@ -52,7 +52,7 @@ mode = 0644
...
@@ -52,7 +52,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
download-only = true
download-only = true
md5sum =
83e690be1744411be552e32b7bbd98ed
md5sum =
e018232e18a4fe6bfadb510f64a9104a
filename = runner-import.sh.jinja2
filename = runner-import.sh.jinja2
mode = 0644
mode = 0644
...
...
software/slaprunner/template/runner-import.sh.jinja2
View file @
741a844a
...
@@ -60,15 +60,15 @@ $SQLITE3 $DATABASE "update software11 set url='$SOFTWARE_RELEASE' where url='$OL
...
@@ -60,15 +60,15 @@ $SQLITE3 $DATABASE "update software11 set url='$SOFTWARE_RELEASE' where url='$OL
# Change slapproxy database to have all instances stopped
# Change slapproxy database to have all instances stopped
$SQLITE3 $DATABASE "update partition11 set slap_state='stopped';"
$SQLITE3 $DATABASE "update partition11 set slap_state='stopped';"
# Build newest software
# Build newest software
$SLAPOS node software --cfg
~/etc/slapos.cfg --pidfile ~
/var/run/slapos-node-software.pid --all >/dev/null 2>&1 || true
$SLAPOS node software --cfg
$HOME/etc/slapos.cfg --pidfile $HOME
/var/run/slapos-node-software.pid --all >/dev/null 2>&1 || true
# Remove defined scripts to force buildout to recreate them to have updated paths
# Remove defined scripts to force buildout to recreate them to have updated paths
rm $srv_directory/runner/instance/slappart*/srv/runner-import-restore
rm $srv_directory/runner/instance/slappart*/srv/runner-import-restore
# Start supervisord
# Start supervisord
$SLAPOS node supervisord --cfg
~
/etc/slapos.cfg -n >/dev/null 2>&1 &
$SLAPOS node supervisord --cfg
$HOME
/etc/slapos.cfg -n >/dev/null 2>&1 &
sleep 5
sleep 5
# Run slapos node instance
# Run slapos node instance
# XXX hardcoded
# XXX hardcoded
$SLAPOS node instance --cfg
~/etc/slapos.cfg --pidfile ~
/var/run/slapos-node-instance.pid >/dev/null 2>&1 || true
$SLAPOS node instance --cfg
$HOME/etc/slapos.cfg --pidfile $HOME
/var/run/slapos-node-instance.pid >/dev/null 2>&1 || true
# Invoke defined scripts for each partition inside of slaprunner
# Invoke defined scripts for each partition inside of slaprunner
for partition in $srv_directory/runner/instance/slappart*/
for partition in $srv_directory/runner/instance/slappart*/
...
...
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