if service not enabled, neutron::agents::ovs fails due to missing dependency on integration bridge

[Xav Paice]

If we need the OVS plugin but not the agent service, when we declare the integration bridge the current code requires Service[neutron-plugin-ovs-service] which is not declared, and the catalog fails with the following:

Error: Could not retrieve catalog from remote server: Error 400 on SERVER: Invalid relationship: Vs_bridge[br-int] { before => Service[neutron-plugin-ovs-service] }, because Service[neutron-plugin-ovs-service] doesn't seem to be in the catalog

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/104775
Committed: https://git.openstack.org/cgit/stackforge/puppet-neutron/commit/?id=064899b70e2f1b26ee6556fa423eee72ebf68db2
Submitter: Jenkins
Branch: master

commit 064899b70e2f1b26ee6556fa423eee72ebf68db2
Author: Xav Paice <email address hidden>
Date: Fri Jul 4 19:05:02 2014 +1200

    for OVS agent, fix dependency on service

    Previously, the declaration for vs_bridge required the service, but if
    the service is not enabled it's not declared. This moves the dependency
    inside an if. See bug #1298146 for the background.

    Change-Id: Ic51efb16d4ba0a971178ff648f963c61b2e9fdde
    Closes-Bug: #1337733