x/solar
Code Issues Proposed changes

Defining actions is meta.yaml works again

Browse Source
This commit is contained in:
Łukasz Oleś 2015-10-23 11:37:25 +02:00
parent c7ef5d8639
commit 7e2460911a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solar/solar/core/resource/resource.py
View File

@ -78,6 +78,7 @@ class Resource(object):
'id': name, 'id': name,
'name': name, 'name': name,
'actions_path': metadata.get('actions_path', ''), 'actions_path': metadata.get('actions_path', ''),
'actions': metadata.get('actions', ''),
'base_name': metadata.get('base_name', ''), 'base_name': metadata.get('base_name', ''),
'base_path': metadata.get('base_path', ''), 'base_path': metadata.get('base_path', ''),
'handler': metadata.get('handler', ''), 'handler': metadata.get('handler', ''),
@ -126,6 +127,11 @@ class Resource(object):
@property @property
def actions(self): def actions(self):
if self.db_obj.actions:
return {action: os.path.join(
self.db_obj.actions_path, name)
for action, name in self.db_obj.actions.items()}
# else
ret = { ret = {
os.path.splitext(p)[0]: os.path.join( os.path.splitext(p)[0]: os.path.join(
self.db_obj.actions_path, p self.db_obj.actions_path, p

1
solar/solar/interfaces/orm.py
View File

@ -617,6 +617,7 @@ class DBResource(DBObject):
id = db_field(schema='str', is_primary=True) id = db_field(schema='str', is_primary=True)
name = db_field(schema='str!') name = db_field(schema='str!')
actions_path = db_field(schema='str') actions_path = db_field(schema='str')
actions = db_field(schema={}, default_value={})
base_name = db_field(schema='str') base_name = db_field(schema='str')
base_path = db_field(schema='str') base_path = db_field(schema='str')
handler = db_field(schema='str') # one of: {'ansible_playbook', 'ansible_template', 'puppet', etc} handler = db_field(schema='str') # one of: {'ansible_playbook', 'ansible_template', 'puppet', etc}