Commit a3db0f99 authored by Łukasz Nowak's avatar Łukasz Nowak

Use locally provided parameters.

parent 5b8c5e94
...@@ -40,21 +40,16 @@ class Recipe(object): ...@@ -40,21 +40,16 @@ class Recipe(object):
slap = slapmodule.slap() slap = slapmodule.slap()
slap_connection = buildout['slap_connection'] self.software_release_url = options['software-url']
self.software_release_url = slap_connection['software_release_url']
# XXX: Dirty network interation stuff slap.initializeConnection(options['server-url'],
slap.initializeConnection(slap_connection['server_url'], options.get('key-file'),
slap_connection.get('key_file'), options.get('cert-file'),
slap_connection.get('cert_file'),
) )
computer_partition = slap.registerComputerPartition( computer_partition = slap.registerComputerPartition(
slap_connection['computer_id'], slap_connection['partition_id']) options['computer-id'], options['partition-id'])
self.request = computer_partition.request self.request = computer_partition.request
if 'software-url' not in options:
options['software-url'] = self.software_release_url
if 'name' not in options: if 'name' not in options:
options['name'] = name options['name'] = name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment