Description of problem:

Attempting to launch an instance using a flavor with a non-zero ephemeral disk will fail with the following traceback:

d0a-acc1e49a6e9a] Traceback (most recent call last):
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/compute/manager.py", line 1407, in _spawn
d0a-acc1e49a6e9a]     block_device_info)
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/virt/libvirt/driver.py", line 2063, in spawn
d0a-acc1e49a6e9a]     admin_pass=admin_password)
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/virt/libvirt/driver.py", line 2370, in _create_image
d0a-acc1e49a6e9a]     ephemeral_size=ephemeral_gb)
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/virt/libvirt/imagebackend.py", line 174, in cache
d0a-acc1e49a6e9a]     *args, **kwargs)
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/virt/libvirt/imagebackend.py", line 307, in create_image
d0a-acc1e49a6e9a]     prepare_template(target=base, max_size=size, *args, **kwargs)
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/openstack/common/lockutils.py", line 246, in inner
d0a-acc1e49a6e9a]     return f(*args, **kwargs)
d0a-acc1e49a6e9a]   File "/usr/lib/python2.7/site-packages/nova/virt/libvirt/imagebackend.py", line 162, in call_if_not_exists
d0a-acc1e49a6e9a]     fetch_func(target=target, *args, **kwargs)
d0a-acc1e49a6e9a] TypeError: _create_ephemeral() got an unexpected keyword argument 'max_size'


Version-Release number of selected component (if applicable):

openstack-nova-compute-2013.2-4.fc20.noarch

This is fixed upstream in commit b3af6e877aaab4ace3d7c43d15d492f6498a0837:

commit b3af6e877aaab4ace3d7c43d15d492f6498a0837
Author: Gonéri Le Bouder <goneri.lebouder>
Date:   Tue Nov 19 11:30:08 2013 +0100

    Add missing argument max_size in libvirt driver
    
    max_size argument was added in commit 3cdfe894ab58f7b91bf7fb690fc5bc724e44066f,
    but missing  in _create_ephemeral and _create_swap method, which cause
    exception raised when caching ephemeral and swap disk files of the instance.
    
    Add test for _create_ephemeral used with max_size parameter
    and test _create_swap method
    
    Closes-Bug: 1251152
    Closes-Bug: 1250032
    (cherry picked from commit 384f55bcb32251698cc2ce839a0286ef99e74984)