Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Hardcoded availability zone in nova-helper"

Browse Source
This commit is contained in:
Jenkins
2017-07-28 08:38:30 +00:00
committed by Gerrit Code Review
parent 3bb66b645c dac0924194
commit 529b0d34ee
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
watcher/common/nova_helper.py
View File

@@ -787,6 +787,9 @@ class NovaHelper(object):
net_obj = {"net-id": nic_id} net_obj = {"net-id": nic_id}
net_list.append(net_obj) net_list.append(net_obj)
# get availability zone of destination host
azone = self.nova.services.list(host=node_id,
binary='nova-compute')[0].zone
instance = self.nova.servers.create( instance = self.nova.servers.create(
inst_name, image, inst_name, image,
flavor=flavor, flavor=flavor,
@@ -794,7 +797,7 @@ class NovaHelper(object):
security_groups=sec_group_list, security_groups=sec_group_list,
nics=net_list, nics=net_list,
block_device_mapping_v2=block_device_mapping_v2, block_device_mapping_v2=block_device_mapping_v2,
availability_zone="nova:%s" % node_id) availability_zone="%s:%s" % (azone, node_id))
# Poll at 5 second intervals, until the status is no longer 'BUILD' # Poll at 5 second intervals, until the status is no longer 'BUILD'
if instance: if instance: