Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Léo-Paul Géneau
slapos.core
Commits
c18acab7
Commit
c18acab7
authored
Oct 26, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop needless complexity.
parent
1d5cf8e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
9 deletions
+2
-9
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_allocateInstance.xml
...Item/portal_skins/slapos_cloud/Alarm_allocateInstance.xml
+0
-1
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml
.../slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml
+1
-7
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
No files found.
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_allocateInstance.xml
View file @
c18acab7
...
@@ -60,7 +60,6 @@ portal.portal_catalog.searchAndActivate(\n
...
@@ -60,7 +60,6 @@ portal.portal_catalog.searchAndActivate(\n
left_join_list=select_dict.keys(),\n
left_join_list=select_dict.keys(),\n
\n
\n
method_id=\'SoftwareInstance_tryToAllocatePartition\',\n
method_id=\'SoftwareInstance_tryToAllocatePartition\',\n
method_kw={\'manual\': False},\n
packet_size=1, # Separate calls to many transactions\n
packet_size=1, # Separate calls to many transactions\n
activate_kw={\'tag\': tag}\n
activate_kw={\'tag\': tag}\n
)\n
)\n
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.xml
View file @
c18acab7
...
@@ -92,13 +92,9 @@ if software_instance.getValidationState() != \'validated\' \\\n
...
@@ -92,13 +92,9 @@ if software_instance.getValidationState() != \'validated\' \\\n
try:\n
try:\n
computer_partition_url = assignComputerPartition(software_instance)\n
computer_partition_url = assignComputerPartition(software_instance)\n
except ValueError:\n
except ValueError:\n
if manual:\n
raise\n
# It was not possible to find free Computer Partition\n
# It was not possible to find free Computer Partition\n
markHistory(software_instance, \'Allocation failed: no free Computer Partition\')\n
markHistory(software_instance, \'Allocation failed: no free Computer Partition\')\n
except Unauthorized, e:\n
except Unauthorized, e:\n
if manual:\n
raise\n
# user has bad balance\n
# user has bad balance\n
markHistory(software_instance, \'Allocation failed: %s\' % e)\n
markHistory(software_instance, \'Allocation failed: %s\' % e)\n
else:\n
else:\n
...
@@ -106,8 +102,6 @@ else:\n
...
@@ -106,8 +102,6 @@ else:\n
try:\n
try:\n
software_instance.Base_checkConsistency()\n
software_instance.Base_checkConsistency()\n
except ValidationFailed:\n
except ValidationFailed:\n
if manual:\n
raise\n
# order not ready yet\n
# order not ready yet\n
markHistory(software_instance, \'Allocation failed: consistency failed\')\n
markHistory(software_instance, \'Allocation failed: consistency failed\')\n
else:\n
else:\n
...
@@ -116,7 +110,7 @@ else:\n
...
@@ -116,7 +110,7 @@ else:\n
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
manual=True
</string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_cloud/bt/revision
View file @
c18acab7
112
113
\ No newline at end of file
\ 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