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
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
Lu Xu
slapos
Commits
092c7c42
Commit
092c7c42
authored
Mar 26, 2013
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Json parameters in condor recipe
parent
1601b8fa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
88 deletions
+81
-88
slapos/recipe/condor/__init__.py
slapos/recipe/condor/__init__.py
+57
-54
software/condor/instance-condor.cfg
software/condor/instance-condor.cfg
+20
-30
software/condor/software.cfg
software/condor/software.cfg
+4
-4
No files found.
slapos/recipe/condor/__init__.py
View file @
092c7c42
...
@@ -32,6 +32,7 @@ import filecmp
...
@@ -32,6 +32,7 @@ import filecmp
import
urlparse
import
urlparse
import
shutil
import
shutil
import
re
import
re
import
json
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
"""Deploy a fully operational condor architecture."""
"""Deploy a fully operational condor architecture."""
...
@@ -219,59 +220,61 @@ class AppSubmit(GenericBaseRecipe):
...
@@ -219,59 +220,61 @@ class AppSubmit(GenericBaseRecipe):
def
getFiles
(
self
):
def
getFiles
(
self
):
"""This is used to download app files if necessary and update options values"""
"""This is used to download app files if necessary and update options values"""
self
.
options
[
'file-number'
]
=
0
app_list
=
json
.
loads
(
self
.
options
[
'condor-app-list'
])
if
self
.
options
[
'files'
]:
if
not
app_list
:
files_list
=
self
.
options
[
'files'
].
splitlines
()
return
None
files_list
=
[
f
for
f
in
files_list
if
f
]
#remove empty elements
for
app
in
app_list
:
self
.
options
[
'file-number'
]
=
len
(
files_list
)
if
app_list
[
app
].
get
(
'files'
,
None
):
for
i
in
range
(
self
.
options
[
'file-number'
]):
file_list
=
app_list
[
app
][
'files'
]
value
=
files_list
[
i
].
strip
()
for
file
in
file_list
:
pos
=
str
(
i
)
if
file
and
(
file
.
startswith
(
'http'
)
or
file
.
startswith
(
'ftp'
)):
if
value
and
(
value
.
startswith
(
'http'
)
or
value
.
startswith
(
'ftp'
)):
file_list
[
file
]
=
self
.
download
(
file_list
[
file
])
self
.
options
[
'name_'
+
pos
]
=
os
.
path
.
basename
(
urlparse
.
urlparse
(
value
)[
2
])
os
.
chmod
(
file_list
[
file
],
0600
)
self
.
options
[
'file_'
+
pos
]
=
self
.
download
(
value
)
os
.
chmod
(
self
.
options
[
'file_'
+
pos
],
0600
)
else
:
else
:
self
.
options
[
'file_'
+
pos
]
=
value
app_list
[
app
][
'files'
]
=
{}
executable
=
self
.
options
[
'executable'
]
executable
=
app_list
[
app
].
get
(
'executable'
,
''
)
if
executable
and
(
executable
.
startswith
(
'http'
)
or
executable
.
startswith
(
'ftp'
)):
if
executable
and
(
executable
.
startswith
(
'http'
)
or
executable
.
startswith
(
'ftp'
)):
self
.
options
[
'executable'
]
=
self
.
download
(
executable
,
app_list
[
app
]
[
'executable'
]
=
self
.
download
(
executable
,
self
.
options
[
'executable-name'
].
strip
()
)
app_list
[
app
][
'executable-name'
]
)
os
.
chmod
(
self
.
options
[
'executabl
e'
],
0700
)
os
.
chmod
(
app_list
[
app
][
'executable-nam
e'
],
0700
)
submit_file
=
self
.
options
[
'description-file'
]
submit_file
=
app_list
[
app
].
get
(
'description-file'
,
''
)
if
submit_file
and
(
submit_file
.
startswith
(
'http'
)
or
submit_file
.
startswith
(
'ftp'
)):
if
submit_file
and
(
submit_file
.
startswith
(
'http'
)
or
submit_file
.
startswith
(
'ftp'
)):
self
.
options
[
'description-file'
]
=
self
.
download
(
submit_file
,
'submit'
)
app_list
[
app
][
'description-file'
]
=
self
.
download
(
submit_file
,
'submit'
)
os
.
chmod
(
self
.
options
[
'description-file'
],
0600
)
os
.
chmod
(
app_list
[
app
][
'description-file'
],
0600
)
return
app_list
def
install
(
self
):
def
install
(
self
):
path_list
=
[]
path_list
=
[]
#check if curent condor instance is an condor master
#check if curent condor instance is an condor master
if
self
.
options
[
'machine-role'
].
strip
()
!=
"manager"
:
if
self
.
options
[
'machine-role'
].
strip
()
!=
"manager"
:
print
"ERROR: cannot submit a job to Condor worker instance"
raise
Exception
(
"Cannot submit a job to Condor worker instance"
)
return
[]
#Setup directory
#Setup directory
jobdir
=
self
.
options
[
'job-dir'
].
strip
()
jobdir
=
self
.
options
[
'job-dir'
].
strip
()
appdir
=
os
.
path
.
join
(
jobdir
,
self
.
options
[
'app-name'
].
strip
())
submitfile
=
os
.
path
.
join
(
appdir
,
'submit'
)
appname
=
self
.
options
[
'app-name'
].
strip
()
if
not
os
.
path
.
exists
(
jobdir
):
if
not
os
.
path
.
exists
(
jobdir
):
os
.
mkdir
(
jobdir
)
os
.
mkdir
(
jobdir
)
app_list
=
self
.
getFiles
()
for
appname
in
app_list
:
appdir
=
os
.
path
.
join
(
jobdir
,
appname
)
if
not
os
.
path
.
exists
(
appdir
):
if
not
os
.
path
.
exists
(
appdir
):
os
.
mkdir
(
appdir
)
os
.
mkdir
(
appdir
)
self
.
getFiles
()
submitfile
=
os
.
path
.
join
(
appdir
,
'submit'
)
self
.
copy_file
(
self
.
options
[
'executable'
],
os
.
path
.
join
(
appdir
,
self
.
options
[
'executable-name'
].
strip
())
self
.
copy_file
(
app_list
[
appname
][
'executable'
],
os
.
path
.
join
(
appdir
,
app_list
[
appname
][
'executable-name'
])
)
)
install
=
self
.
copy_file
(
self
.
options
[
'description-file'
],
submitfile
)
install
=
self
.
copy_file
(
app_list
[
appname
]
[
'description-file'
],
submitfile
)
sig_install
=
os
.
path
.
join
(
appdir
,
'.install'
)
sig_install
=
os
.
path
.
join
(
appdir
,
'.install'
)
if
install
:
if
install
:
with
open
(
sig_install
,
'w'
)
as
f
:
with
open
(
sig_install
,
'w'
)
as
f
:
f
.
write
(
'to_install'
)
f
.
write
(
'to_install'
)
for
i
in
range
(
self
.
options
[
'file-number'
])
:
for
file
in
app_list
[
appname
][
'files'
]
:
destination
=
os
.
path
.
join
(
appdir
,
self
.
options
[
'name_'
+
str
(
i
)]
)
destination
=
os
.
path
.
join
(
appdir
,
file
)
if
os
.
path
.
exists
(
destination
):
if
os
.
path
.
exists
(
destination
):
os
.
unlink
(
destination
)
os
.
unlink
(
destination
)
os
.
symlink
(
self
.
options
[
'file_'
+
str
(
i
)
],
destination
)
os
.
symlink
(
app_list
[
appname
][
'files'
][
file
],
destination
)
#generate wrapper for submitting job
#generate wrapper for submitting job
condor_submit
=
os
.
path
.
join
(
self
.
options
[
'bin'
].
strip
(),
'condor_submit'
)
condor_submit
=
os
.
path
.
join
(
self
.
options
[
'bin'
].
strip
(),
'condor_submit'
)
parameter
=
dict
(
submit
=
condor_submit
,
sig_install
=
sig_install
,
parameter
=
dict
(
submit
=
condor_submit
,
sig_install
=
sig_install
,
...
...
software/condor/instance-condor.cfg
View file @
092c7c42
...
@@ -24,7 +24,7 @@ srv = $${buildout:directory}/srv/
...
@@ -24,7 +24,7 @@ srv = $${buildout:directory}/srv/
[
basedirectory
]
[
basedirectory
]
recipe
=
slapos
.
cookbook
:
mkdirectory
recipe
=
slapos
.
cookbook
:
mkdirectory
log
=
$${
rootdirectory
:
var
}/
log
/
log
=
$${
rootdirectory
:
var
}/
log
/
s
ervice
s
=
$${
rootdirectory
:
etc
}/
run
/
s
cript
s
=
$${
rootdirectory
:
etc
}/
run
/
run
=
$${
rootdirectory
:
var
}/
run
/
run
=
$${
rootdirectory
:
var
}/
run
/
backup
=
$${
rootdirectory
:
srv
}/
backup
/
backup
=
$${
rootdirectory
:
srv
}/
backup
/
promises
=
$${
rootdirectory
:
etc
}/
promise
/
promises
=
$${
rootdirectory
:
etc
}/
promise
/
...
@@ -35,7 +35,7 @@ wrapper = $${basedirectory:run}/condor
...
@@ -35,7 +35,7 @@ wrapper = $${basedirectory:run}/condor
[
condor
]
[
condor
]
recipe
=
slapos
.
cookbook
:
condor
recipe
=
slapos
.
cookbook
:
condor
wrapper
-
dir
=
$${
basedirectory
:
s
ervice
s
}
wrapper
-
dir
=
$${
basedirectory
:
s
cript
s
}
ip
=
$${
slap
-
network
-
information
:
global
-
ipv6
}
ip
=
$${
slap
-
network
-
information
:
global
-
ipv6
}
package
=
${
condor
:
location
}
package
=
${
condor
:
location
}
rootdirectory
=
$${
buildout
:
directory
}
rootdirectory
=
$${
buildout
:
directory
}
...
@@ -50,46 +50,36 @@ environment =
...
@@ -50,46 +50,36 @@ environment =
LD_LIBRARY_PATH
=${
libexpat
:
location
}/
lib
:${
kerberos
:
location
}/
lib
:${
openldap
:
location
}/
lib
:${
zlib
:
location
}/
lib
LD_LIBRARY_PATH
=${
libexpat
:
location
}/
lib
:${
kerberos
:
location
}/
lib
:${
openldap
:
location
}/
lib
:${
zlib
:
location
}/
lib
PATH
=${
perl
:
location
}/
bin
:${
java
:
location
}/
bin
:${
kerberos
:
location
}/
bin
:${
openldap
:
location
}/
bin
:%(
PATH
)
s
PATH
=${
perl
:
location
}/
bin
:${
java
:
location
}/
bin
:${
kerberos
:
location
}/
bin
:${
openldap
:
location
}/
bin
:%(
PATH
)
s
HOME
=$${
rootdirectory
:
condor
}
HOME
=$${
rootdirectory
:
condor
}
HOSTNAME
=$${
slap
-
parameter
:
condor
_
host
}
HOSTNAME
=$${
slap
-
parameter
:
condor
-
host
}
#
Condor
user
parameter
#
Condor
user
parameter
condor_host
=
$${
slap
-
parameter
:
condor
_
host
}
condor_host
=
$${
slap
-
parameter
:
condor
-
host
}
collector_name
=
$${
slap
-
parameter
:
co
llector_
name
}
collector_name
=
$${
slap
-
parameter
:
co
ndor
-
collector
-
name
}
#
Condor
machine
role
:
worker
=
submit
,
execute
manager
=
manager
,
submit
#
Condor
machine
role
:
worker
=
submit
,
execute
manager
=
manager
,
submit
machine
-
role
=
$${
slap
-
parameter
:
role
}
machine
-
role
=
$${
slap
-
parameter
:
condor
-
role
}
disk
-
space
=
$${
slap
-
parameter
:
diskspace
}
disk
-
space
=
$${
slap
-
parameter
:
condor
-
diskspace
}
allowed
-
write
=
$${
slap
-
parameter
:
allowed
-
write
}
allowed
-
write
=
$${
slap
-
parameter
:
condor
-
allowed
-
write
}
admin
-
email
=
$${
slap
-
parameter
:
admin
-
email
}
admin
-
email
=
$${
slap
-
parameter
:
condor
-
admin
-
email
}
[
app
-
submit
]
[
app
-
submit
]
<=
condor
<=
condor
recipe
=
slapos
.
cookbook
:
condor
.
submit
recipe
=
slapos
.
cookbook
:
condor
.
submit
app
-
name
=
$${
slap
-
parameter
:
app
-
name
}
condor
-
app
-
list
=
$${
slap
-
parameter
:
condor
-
app
-
list
}
#
user
can
specifie
a
list
files
to
use
in
application
,
one
per
line
files
=
$${
slap
-
parameter
:
files
}
description
-
file
=
$${
slap
-
parameter
:
description
-
file
}
executable
=
$${
slap
-
parameter
:
executable
}
executable
-
name
=
$${
slap
-
parameter
:
executable
-
name
}
#
Publish
all
instance
parameters
(
url
of
instance
)
#
Publish
all
instance
parameters
(
url
of
instance
)
[
publish
-
connection
-
informations
]
[
publish
-
connection
-
informations
]
recipe
=
slapos
.
cookbook
:
publish
recipe
=
slapos
.
cookbook
:
publish
ipv6_address
=
$${
condor
:
ip
}
condor_
ipv6_address
=
$${
condor
:
ip
}
instance_type
=
$${
condor
:
machine
-
role
}
condor_
instance_type
=
$${
condor
:
machine
-
role
}
condor_host
=
$${
condor
:
condor_host
}
condor_host
=
$${
condor
:
condor_host
}
[
slap
-
parameter
]
[
slap
-
parameter
]
#
Default
values
if
not
specified
#
Default
values
if
not
specified
condor_host
=
[$${
slap
-
network
-
information
:
global
-
ipv6
}]
condor
-
host
=
[$${
slap
-
network
-
information
:
global
-
ipv6
}]
collector_name
=
SLAPOS
-
CONDOR
-
POOL
condor
-
collector
-
name
=
SLAPOS
-
CONDOR
-
POOL
role
=
manager
condor
-
role
=
manager
diskspace
=
5
condor
-
diskspace
=
5
admin
-
email
=
condor
-
admin
-
email
=
allowed
-
write
=
$${:
condor_host
}
condor
-
allowed
-
write
=
$${:
condor
-
host
}
#
submit
application
#
submit
application
,
using
Json
application
list
app
-
name
=
condor_test
condor
-
app
-
list
=
${
condor
-
application
:
list
}
description
-
file
=
${
description
-
file
:
location
}/${
description
-
file
:
filename
}
executable
=
${
executable
:
location
}/${
executable
:
filename
}
executable
-
name
=
${
executable
:
filename
}
#
user
can
specifie
a
list
of
input
file
,
one
per
line
files
=
software/condor/software.cfg
View file @
092c7c42
...
@@ -30,7 +30,7 @@ md5sum = 9e9db6f4c5e38ce3fd45d43c2bf616a8
...
@@ -30,7 +30,7 @@ md5sum = 9e9db6f4c5e38ce3fd45d43c2bf616a8
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-condor.cfg
url = ${:_profile_base_location_}/instance-condor.cfg
output = ${buildout:directory}/template-condor.cfg
output = ${buildout:directory}/template-condor.cfg
md5sum =
213b8c28be36f38103c7a100adb91d3f
md5sum =
42985a425369e4f93211cfaad21d8eb8
mode = 0644
mode = 0644
[description-file]
[description-file]
...
@@ -49,6 +49,9 @@ filename = simple
...
@@ -49,6 +49,9 @@ filename = simple
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
md5sum = c512f495cdd112bceb04feab7c909a10
md5sum = c512f495cdd112bceb04feab7c909a10
[condor-application]
list = {"condor_test":{"description-file":"${description-file:location}/${description-file:filename}", "executable":"${executable:location}/${executable:filename}", "executable-name":"${executable:filename}", "files":{}}}
# Local development
# Local development
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = plone.recipe.command
recipe = plone.recipe.command
...
@@ -64,6 +67,3 @@ recipe = plone.recipe.command
...
@@ -64,6 +67,3 @@ recipe = plone.recipe.command
stop-on-error = true
stop-on-error = true
update-command = ${:command}
update-command = ${:command}
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
[versions]
lxml = 2.3.6
\ No newline at end of file
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