scheduler filter disk_filter doesn't take swap into account

[Joe Gordon]

from nova/scheduler/filters/disk_filter.py

    def host_passes(self, host_state, filter_properties):
        """Filter based on disk usage."""
        instance_type = filter_properties.get('instance_type')
        requested_disk = 1024 * (instance_type['root_gb'] +
                                 instance_type['ephemeral_gb'])

This should take into account swap, which is stored in MB, as well.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/51323

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/51323
Committed: http://github.com/openstack/nova/commit/e842fff31fd77289507d89387a62eee288aea6bc
Submitter: Jenkins
Branch: master

commit e842fff31fd77289507d89387a62eee288aea6bc
Author: Joe Gordon <email address hidden>
Date: Fri Oct 11 17:06:33 2013 -0700

    Make scheduler disk_filter take swap into account

    The disk_filter, which makes sure a node has enough disk space for an
    instance doesn't take the swap partition into account, but swap takes up
    disk space so it should.

    Change-Id: I0779dcf0f1cd60017b5b49ca38c0a15b23d802d7
    Closes-Bug: #1239009