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
Joanne Hugé
slapos
Commits
f1a575a3
Commit
f1a575a3
authored
Oct 02, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'resiliency-cleanup'
parents
7d8f929a
4adbdc04
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
24 deletions
+36
-24
slapos/recipe/request.py
slapos/recipe/request.py
+11
-3
slapos/recipe/softwaretype.py
slapos/recipe/softwaretype.py
+2
-1
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+22
-19
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
slapos/recipe/request.py
View file @
f1a575a3
...
@@ -140,9 +140,12 @@ class Recipe(object):
...
@@ -140,9 +140,12 @@ class Recipe(object):
if
self
.
failed
is
not
None
:
if
self
.
failed
is
not
None
:
# Check instance status to know if instance has been deployed
# Check instance status to know if instance has been deployed
try
:
try
:
if
self
.
instance
.
getComputerId
()
is
not
None
:
status
=
self
.
instance
.
getState
()
status
=
self
.
instance
.
getState
()
else
:
status
=
'not ready yet'
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
):
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
):
status
=
'not ready yet
, please try again
'
status
=
'not ready yet'
except
AttributeError
:
except
AttributeError
:
status
=
'unknown'
status
=
'unknown'
error_message
=
'Connection parameter %s not found. '
\
error_message
=
'Connection parameter %s not found. '
\
...
@@ -163,7 +166,10 @@ class RequestOptional(Recipe):
...
@@ -163,7 +166,10 @@ class RequestOptional(Recipe):
if
self
.
failed
is
not
None
:
if
self
.
failed
is
not
None
:
# Check instance status to know if instance has been deployed
# Check instance status to know if instance has been deployed
try
:
try
:
if
self
.
instance
.
getComputerId
()
is
not
None
:
status
=
self
.
instance
.
getState
()
status
=
self
.
instance
.
getState
()
else
:
status
=
'not ready yet'
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
):
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
):
status
=
'not ready yet'
status
=
'not ready yet'
except
AttributeError
:
except
AttributeError
:
...
@@ -173,3 +179,5 @@ class RequestOptional(Recipe):
...
@@ -173,3 +179,5 @@ class RequestOptional(Recipe):
'check status of this instance.'
%
(
self
.
failed
,
status
)
'check status of this instance.'
%
(
self
.
failed
,
status
)
self
.
logger
.
warning
(
error_message
)
self
.
logger
.
warning
(
error_message
)
return
[]
return
[]
update
=
install
slapos/recipe/softwaretype.py
View file @
f1a575a3
...
@@ -87,7 +87,8 @@ class Recipe:
...
@@ -87,7 +87,8 @@ class Recipe:
computer_partition_id
)
computer_partition_id
)
self
.
parameter_dict
=
self
.
computer_partition
.
getInstanceParameterDict
()
self
.
parameter_dict
=
self
.
computer_partition
.
getInstanceParameterDict
()
software_type
=
self
.
parameter_dict
[
'slap_software_type'
]
software_type
=
self
.
parameter_dict
[
'slap_software_type'
]
self
.
logger
.
info
(
'Deplying instance with software type %s'
%
software_type
)
self
.
logger
.
info
(
'Deploying instance with software type %s'
%
\
software_type
)
if
software_type
not
in
self
.
options
:
if
software_type
not
in
self
.
options
:
if
'default'
in
self
.
options
:
if
'default'
in
self
.
options
:
...
...
stack/lamp/buildout.cfg
View file @
f1a575a3
...
@@ -267,6 +267,9 @@ signature-certificate-list =
...
@@ -267,6 +267,9 @@ signature-certificate-list =
-----END CERTIFICATE-----
-----END CERTIFICATE-----
[versions]
[versions]
# 1.2.4b doesn't download
MySQL-python = 1.2.3
Jinja2 = 2.6
Jinja2 = 2.6
Werkzeug = 0.8.3
Werkzeug = 0.8.3
apache-libcloud = 0.11.3
apache-libcloud = 0.11.3
...
@@ -278,19 +281,19 @@ meld3 = 0.6.9
...
@@ -278,19 +281,19 @@ meld3 = 0.6.9
pycrypto = 2.6
pycrypto = 2.6
rdiff-backup = 1.0.5
rdiff-backup = 1.0.5
slapos.cookbook = 0.67
slapos.cookbook = 0.67
slapos.recipe.build = 0.11.
4
slapos.recipe.build = 0.11.
5
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.3
0
slapos.toolbox = 0.3
1
smmap = 0.8.2
smmap = 0.8.2
# Required by:
# Required by:
# slapos.core==0.3
0
# slapos.core==0.3
1.2
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
Flask = 0.9
Flask = 0.9
# Required by:
# Required by:
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
...
@@ -298,11 +301,11 @@ GitPython = 0.3.2.RC1
...
@@ -298,11 +301,11 @@ GitPython = 0.3.2.RC1
PyXML = 0.8.4
PyXML = 0.8.4
# Required by:
# Required by:
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
atomize = 0.1.1
atomize = 0.1.1
# Required by:
# Required by:
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
feedparser = 5.1.2
feedparser = 5.1.2
# Required by:
# Required by:
...
@@ -315,7 +318,7 @@ inotifyx = 0.2.0
...
@@ -315,7 +318,7 @@ inotifyx = 0.2.0
# Required by:
# Required by:
# slapos.cookbook==0.67
# slapos.cookbook==0.67
# slapos.core==0.3
0
# slapos.core==0.3
1.2
# xml-marshaller==0.9.7
# xml-marshaller==0.9.7
lxml = 3.0alpha2
lxml = 3.0alpha2
...
@@ -324,15 +327,15 @@ lxml = 3.0alpha2
...
@@ -324,15 +327,15 @@ lxml = 3.0alpha2
netaddr = 0.7.10
netaddr = 0.7.10
# Required by:
# Required by:
# slapos.core==0.3
0
# slapos.core==0.3
1.2
netifaces = 0.8
netifaces = 0.8
# Required by:
# Required by:
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
paramiko = 1.7.7.2
paramiko = 1.7.7.2
# Required by:
# Required by:
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
psutil = 0.6.1
psutil = 0.6.1
# Required by:
# Required by:
...
@@ -341,24 +344,24 @@ pytz = 2012f
...
@@ -341,24 +344,24 @@ pytz = 2012f
# Required by:
# Required by:
# slapos.cookbook==0.67
# slapos.cookbook==0.67
# slapos.core==0.3
0
# slapos.core==0.3
1.2
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
# zc.buildout==1.6.0-dev-SlapOS-0
07
# zc.buildout==1.6.0-dev-SlapOS-0
10
# zc.recipe.egg==1.3.2
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
setuptools = 0.6c12dev-r88846
# Required by:
# Required by:
# slapos.cookbook==0.67
# slapos.cookbook==0.67
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
slapos.core = 0.3
0
slapos.core = 0.3
1.2
# Required by:
# Required by:
# slapos.core==0.3
0
# slapos.core==0.3
1.2
supervisor = 3.0b1
supervisor = 3.0b1
# Required by:
# Required by:
# slapos.cookbook==0.67
# slapos.cookbook==0.67
# slapos.toolbox==0.3
0
# slapos.toolbox==0.3
1
xml-marshaller = 0.9.7
xml-marshaller = 0.9.7
# Required by:
# Required by:
...
@@ -366,5 +369,5 @@ xml-marshaller = 0.9.7
...
@@ -366,5 +369,5 @@ xml-marshaller = 0.9.7
zc.recipe.egg = 1.3.2
zc.recipe.egg = 1.3.2
# Required by:
# Required by:
# slapos.core==0.3
0
# slapos.core==0.3
1.2
zope.interface = 4.0.1
zope.interface = 4.0.1
stack/slapos.cfg
View file @
f1a575a3
...
@@ -59,7 +59,7 @@ eggs =
...
@@ -59,7 +59,7 @@ eggs =
[versions]
[versions]
# Use SlapOS patched zc.buildout
# Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-0
07
zc.buildout = 1.6.0-dev-SlapOS-0
10
[networkcache]
[networkcache]
download-cache-url = http://www.shacache.org/shacache
download-cache-url = http://www.shacache.org/shacache
...
...
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