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
dac8cd44
Commit
dac8cd44
authored
Mar 16, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use json import, 'unjson' name sounds weird.
parent
bfd63e6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
slapos/recipe/generic_kvm_frontend/__init__.py
slapos/recipe/generic_kvm_frontend/__init__.py
+1
-2
No files found.
slapos/recipe/generic_kvm_frontend/__init__.py
View file @
dac8cd44
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
##############################################################################
##############################################################################
from
slapos.recipe.librecipe
import
GenericBaseRecipe
from
slapos.recipe.librecipe
import
GenericBaseRecipe
import
json
import
json
from
json
import
loads
as
unjson
class
Recipe
(
GenericBaseRecipe
):
class
Recipe
(
GenericBaseRecipe
):
"""
"""
...
@@ -85,7 +84,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -85,7 +84,7 @@ class Recipe(GenericBaseRecipe):
def
install
(
self
):
def
install
(
self
):
# Generate rewrite rules
# Generate rewrite rules
rewrite_rule_list
=
self
.
_getRewriteRuleContent
(
rewrite_rule_list
=
self
.
_getRewriteRuleContent
(
unjson
(
self
.
options
[
'slave-instance-list'
]))
json
.
loads
(
self
.
options
[
'slave-instance-list'
]))
# Create Map
# Create Map
map_content
=
self
.
_getProxyTableContent
(
rewrite_rule_list
)
map_content
=
self
.
_getProxyTableContent
(
rewrite_rule_list
)
map_file
=
self
.
createFile
(
self
.
options
[
'map-path'
],
map_content
)
map_file
=
self
.
createFile
(
self
.
options
[
'map-path'
],
map_content
)
...
...
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