xanderio/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove that crappy old singleton object_id thingy

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2013-07-10 16:31:58 +02:00
commit 7205cd5ecf
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cdist/emulator.py
View file

@ -34,7 +34,7 @@ class Emulator(object):
self.stdin = stdin
self.env = env
self.object_id = False
self.object_id = ''
self.global_path = self.env['__global']
self.target_host = self.env['__target_host']
@ -54,10 +54,10 @@ class Emulator(object):
"""Add hostname and object to logs via logging Filter"""
prefix = self.target_host + ": (emulator)"
if self.object_id:
prefix = prefix + " " + self.type_name + "/" + self.object_id
prefix = '{0}: emulator {1}'.format(
self.target_host,
core.CdistObject.join_name(self.type_name, self.object_id)
)
record.msg = prefix + ": " + record.msg
return True
@ -122,9 +122,7 @@ class Emulator(object):
def setup_object(self):
# Setup object_id - FIXME: unset / do not setup anymore!
if self.cdist_type.is_singleton:
self.object_id = "singleton"
else:
if not self.cdist_type.is_singleton:
self.object_id = self.args.object_id[0]
del self.args.object_id