openstack/sahara
Code Issues Proposed changes

Add use of nova_kwargs for nova servers create to improve readability

Browse Source 
so if we have to add new args to the servers.create call,
we'll be able to use nova_kwargs and avoid mulitple calls
of servers.create with multiple if conditions.

Closes-Bug: 1368109
Change-Id: Ib2e435846d3f3d6907c4959ba31abf003c3b47d7
This commit is contained in:
Pierre Padrixe
2014-09-05 11:56:50 +02:00
parent 8c656982a3
commit 83eb4ec189
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sahara/service/direct_engine.py
View File

@@ -289,22 +289,17 @@ class DirectEngine(e.Engine):
hints = {'group': aa_group} if (
aa_group and self._need_aa_server_group(node_group)) else None
nova_kwargs = {'scheduler_hints': hints, 'userdata': userdata,
'key_name': cluster.user_keypair_id,
'security_groups': node_group.security_groups}
if CONF.use_neutron:
net_id = cluster.neutron_management_network
nics = [{"net-id": net_id, "v4-fixed-ip": ""}]
nova_instance = nova.client().servers.create(
name, node_group.get_image_id(), node_group.flavor_id,
scheduler_hints=hints, userdata=userdata,
key_name=cluster.user_keypair_id,
nics=nics, security_groups=node_group.security_groups)
else:
nova_instance = nova.client().servers.create(
name, node_group.get_image_id(), node_group.flavor_id,
scheduler_hints=hints, userdata=userdata,
key_name=cluster.user_keypair_id,
security_groups=node_group.security_groups)
nova_kwargs['nics'] = [{"net-id": net_id, "v4-fixed-ip": ""}]
nova_instance = nova.client().servers.create(name,
node_group.get_image_id(),
node_group.flavor_id,
**nova_kwargs)
instance_id = conductor.instance_add(ctx, node_group,
{"instance_id": nova_instance.id,
"instance_name": name})