ocf script for ovs-agent some times can't kill ovs-agent

[Sergey Vasilenko]

[root@node-1 ~]# crm resource stop p_neutron-openvswitch-agent

[root@node-1 ~]# service neutron-server stop
Stopping neutron: [ OK ]

[root@node-1 ~]# ps axf | grep neu
30010 pts/0 S+ 0:00 | \_ grep neu
27904 ? S 0:00 /usr/bin/python /usr/bin/neutron-openvswitch-agent --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini

[root@node-1 ~]# crm status
Last updated: Wed Dec 11 15:02:24 2013
Last change: Wed Dec 11 15:01:52 2013 via cibadmin on node-1.domain.tld
Stack: openais
Current DC: node-1.domain.tld - partition WITHOUT quorum
Version: 1.1.8-1.el6-1f8858c
1 Nodes configured, 2 expected votes
9 Resources configured.

Online: [ node-1.domain.tld ]

 vip__management_old (ocf::heartbeat:IPaddr2): Started node-1.domain.tld
 vip__public_old (ocf::heartbeat:IPaddr2): Started node-1.domain.tld
 Clone Set: clone_p_haproxy [p_haproxy]
     Started: [ node-1.domain.tld ]
 Clone Set: clone_p_mysql [p_mysql]
     Started: [ node-1.domain.tld ]

Failed actions:
    p_neutron-openvswitch-agent_monitor_20000 (node=node-1.domain.tld, call=8122, rc=7, status=complete): not running

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/61492
Committed: http://github.com/stackforge/fuel-library/commit/e18c383d31fe886968577ea9c4534c824df013b4
Submitter: Jenkins
Branch: master

commit e18c383d31fe886968577ea9c4534c824df013b4
Author: Sergey Vasilenko <email address hidden>
Date: Wed Dec 11 19:29:44 2013 +0400

    Change STOP agent method

    * FIX: returned wrong ERROR-CODE
    * Server -> Agent in messages
    * remove clean_and_recreate_ovs_bridges() as not needed
    * remove integration_bridge parameter

    Closes-Bug: #1259964
    Change-Id: I891e0012ef32c962bb7e272ee7505dda38dbec84