Commit 8b99ab9d authored by Guillaume Bottex's avatar Guillaume Bottex

Few fixes, again.

parent bfc632ef
...@@ -36,7 +36,7 @@ class NoSQLTestBed(BaseSlapRecipe): ...@@ -36,7 +36,7 @@ class NoSQLTestBed(BaseSlapRecipe):
self.parameter_dict = self.computer_partition.getInstanceParameterDict() self.parameter_dict = self.computer_partition.getInstanceParameterDict()
try: try:
entry_point = pkg_resources.iter_entry_points(group='slapos.recipe.nosqltestbed.plugin', entry_point = pkg_resources.iter_entry_points(group='slapos.recipe.nosqltestbed.plugin',
name=self.parameter_dict['plugin']).next() name=self.parameter_dict.get('plugin', 'kumo')).next()
plugin_class = entry_point.load() plugin_class = entry_point.load()
testbed = plugin_class() testbed = plugin_class()
......
...@@ -76,7 +76,6 @@ class KumoTestBed(object): ...@@ -76,7 +76,6 @@ class KumoTestBed(object):
kumo_cloud_connection = {} kumo_cloud_connection = {}
kumo_cloud_connection['url'] = "http://["+kumo_cloud_config['address']+"]:5000/" kumo_cloud_connection['url'] = "http://["+kumo_cloud_config['address']+"]:5000/"
kumo_cloud_connection['computer_guid_list'] = kumo_cloud_config['computer_guid_list'] kumo_cloud_connection['computer_guid_list'] = kumo_cloud_config['computer_guid_list']
kumo_cloud_connection['plugin'] = kumo_cloud_config['plugin']
recipe.computer_partition.setConnectionDict(kumo_cloud_connection) recipe.computer_partition.setConnectionDict(kumo_cloud_connection)
nosqltester_manager_wrapper_template_location = pkg_resources.resource_filename( nosqltester_manager_wrapper_template_location = pkg_resources.resource_filename(
......
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