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
Xiaowu Zhang
slapos
Commits
fd5f808b
Commit
fd5f808b
authored
Sep 12, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapconfiguration: returns also slapuser
parent
58e4f80e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
slapos/recipe/slapconfiguration.py
slapos/recipe/slapconfiguration.py
+5
-0
No files found.
slapos/recipe/slapconfiguration.py
View file @
fd5f808b
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
import
json
import
json
import
os
import
os
import
pwd
import
slapos.slap
import
slapos.slap
from
slapos.recipe.librecipe
import
unwrap
from
slapos.recipe.librecipe
import
unwrap
...
@@ -105,6 +106,8 @@ class Recipe(object):
...
@@ -105,6 +106,8 @@ class Recipe(object):
anyway, and are available through "configuration" output key.
anyway, and are available through "configuration" output key.
instance-state
instance-state
The instance state.
The instance state.
slapuser
The username associated to the slappart.
"""
"""
# XXX: used to detect if a configuration key is a valid section key. This
# XXX: used to detect if a configuration key is a valid section key. This
...
@@ -122,6 +125,8 @@ class Recipe(object):
...
@@ -122,6 +125,8 @@ class Recipe(object):
options
[
'configuration.'
+
key
]
=
value
options
[
'configuration.'
+
key
]
=
value
def
fetch_parameter_dict
(
self
,
options
,
instance_root
):
def
fetch_parameter_dict
(
self
,
options
,
instance_root
):
options
[
'slapuser'
]
=
str
(
pwd
.
getpwuid
(
os
.
getuid
()).
pw_name
)
slap
=
slapos
.
slap
.
slap
()
slap
=
slapos
.
slap
.
slap
()
slap
.
initializeConnection
(
slap
.
initializeConnection
(
options
[
'url'
],
options
[
'url'
],
...
...
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