Description of problem
----------------------

Upgrading openstack-neutron-2013.2-3.fc20.noarch (Havana) to
openstack-neutron-2014.1-0.1.b1.fc21.noarch (IceHouse-M1), and 
restarting openstack-neutron-agent fails with the below:

[. . .]
"/usr/lib/python2.7/site-packages/neutron/agent/linux/async_process.py", ...odule>
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: import psutil
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: ImportError: No module
named psutil
Jan 07 02:45:15 node2-compute systemd[1]: neutron-openvswitch-agent.service: main process
exited, code=exited, status=1/FAILURE
[. . .]

Workaround: 

  $ yum install python-psutil -y


Version
-------

I upgraded from openstack-neutron-2013.2-3.fc20.noarch to
openstack-neutron-2014.1-0.1.b1.fc21.noarch


Test env
--------

A two node OpenStack RDO set-up configured manually on two Fedora 20
VMs:

  - Controller node: Nova, Keystone, Cinder, Glance, Neutron (using Open
    vSwitch plugin and GRE tunneling).

  - Compute node: Nova (nova-compute), Neutron (openvswitch-agent)


How reproducible: Consistently.


Steps to Reproduce
------------------

Assuming you have openstack-neutron-2013.2-3.fc20.noarch, on your
current Fedora-20 OpenStack setup:

    $ yum install \
      http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-1.noarch.rpm

    $ yum update openstack-neutron -y

    $ systemctl restart openstack-neutron


Actual results 
--------------

Restart fails with:

[. . .]
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: from neutron.agent.linux import polling
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: File "/usr/lib/python2.7/site-packages/neutron/agent/linux/polling.py", line 2...odule>
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: from neutron.agent.linux import ovsdb_monitor
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: File "/usr/lib/python2.7/site-packages/neutron/agent/linux/ovsdb_monitor.py", ...odule>
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: from neutron.agent.linux import async_process
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: File "/usr/lib/python2.7/site-packages/neutron/agent/linux/async_process.py", ...odule>
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: import psutil
Jan 07 02:45:15 node2-compute neutron-openvswitch-agent[3471]: ImportError: No module named psutil
Jan 07 02:45:15 node2-compute systemd[1]: neutron-openvswitch-agent.service: main process exited, code=exited, status=1/FAILURE
Jan 07 02:45:15 node2-compute systemd[1]: Unit neutron-openvswitch-agent.service entered failed state.
Hint: Some lines were ellipsized, use -l to show in full.
[root@node2-compute ~]# systemctl status neutron-openvswitch-agent -l
neutron-openvswitch-agent.service - OpenStack Quantum Open vSwitch Agent
   Loaded: loaded (/usr/lib/systemd/system/neutron-openvswitch-agent.service; enabled)
[. . .]


Expected results
----------------

On upgrade, openstack-neutron should pull in the python-psutil 
dependency. Restart of neutron-openvswitch-agent should be successful.


Additional info
---------------

I checked in Fedora git for Neutron master branch, for 'Requires' on
python-psutil, it's not present:

    $ git branch
    * master
    
    $ git log | head -1
    commit be96ca650ad6c02310875491d68bb64f139da543

    $ egrep -i 'Requires.*python-psutil' openstack-neutron.spec 
    $ echo $?
    1