x/solar
Code Issues Proposed changes

Remove remove node to resource convertation

Browse Source
This commit is contained in:
Evgeniy L
2015-05-28 15:52:15 +02:00
parent 968966996b
commit 9605a2a21a
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.yaml
View File

@@ -13,4 +13,4 @@ file-system-db:
template-dir: /vagrant/templates
resources-files-mask: /vagrant/resources/*/*.yaml
resource-instances-path: /vagrant/tmp/resource-instances
node_resource_template: /vagrant/resources/ro_node/meta.yaml
node_resource_template: /vagrant/resources/ro_node/

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

@@ -200,23 +200,11 @@ def assign_resources_to_nodes(resources, nodes, dst_dir):
node_uuid = node['id']
node_resource_template = solar.utils.read_config()['node_resource_template']
created_resource = create(resource_uuid, resource['dir_path'], dst_dir, res)
created_node = create(node_uuid, node_resource_template, dst_dir, make_resource_from_node(node))
created_resource = create(resource_uuid, resource['dir_path'], dst_dir, res['input'])
created_node = create(node_uuid, node_resource_template, dst_dir, node)
signals.connect(created_node, created_resource)
def make_resource_from_node(node):
node_resource_template = os.path.join(solar.utils.read_config()['node_resource_template'], 'meta.yaml')
template = yaml.load(open(node_resource_template).read())
template['input']['ip'] = node['ip']
template['input']['ssh_key'] = node['ssh_private_key_path']
template['input']['ssh_user'] = node['ssh_user']
template['tags'] = node['tags']
return template
def connect_resources(profile):
connections = profile.get('connections', [])
resources = load_all(solar.utils.read_config()['resource-instances-path'])