equal
deleted
inserted
replaced
1336 # resize process) |
1336 # resize process) |
1337 tstate = instance['task_state'] |
1337 tstate = instance['task_state'] |
1338 if tstate not in [task_states.RESIZE_FINISH, |
1338 if tstate not in [task_states.RESIZE_FINISH, |
1339 task_states.RESIZE_REVERTING, |
1339 task_states.RESIZE_REVERTING, |
1340 task_states.RESIZE_MIGRATING, |
1340 task_states.RESIZE_MIGRATING, |
1341 task_states.REBUILD_SPAWNING]: |
1341 task_states.REBUILD_SPAWNING] or \ |
|
1342 (tstate == task_states.REBUILD_SPAWNING and |
|
1343 instance.system_metadata['rebuilding']): |
1342 subnet_uuid = port['fixed_ips'][0]['subnet_id'] |
1344 subnet_uuid = port['fixed_ips'][0]['subnet_id'] |
1343 subnet = network_plugin.show_subnet(subnet_uuid)['subnet'] |
1345 subnet = network_plugin.show_subnet(subnet_uuid)['subnet'] |
1344 |
1346 |
1345 if subnet['enable_dhcp']: |
1347 if subnet['enable_dhcp']: |
1346 tree = sysconfig.create_ncp_defaultfixed('dhcp', linkname, |
1348 tree = sysconfig.create_ncp_defaultfixed('dhcp', linkname, |