Previously the -src job explicitly included the -keys then the -src
setup playbooks as separate pre-run playbooks. Unfortunately, this
doesn't work because we are only modifying the dynamic inventory in the
-keys playbooks. This doesn't carry over to a second playbook
instantiation for -src. Fix this by "reverting" back to using the old
pre.yaml playbook which imports both -keys and -src in one playbook
ensuring that the second playbook sees the updated dynamic inventory
that includes the bridge.
Change-Id: I947dae89ed3af2092a1e11171c5e90e9dcc8f3e3
a2c59b50e1