Merge "modified on the lines of nosdn bundle tested. Only single gateway needed for...

diff --cc ci/nosdn/juju-deployer/ovs-ha.yaml
Simple merge

diff --cc ci/nosdn/juju-deployer/ovs-tip.yaml
Simple merge

diff --cc ci/nosdn/juju-deployer/ovs.yaml
Simple merge

diff --cc ci/odl/juju-deployer/ovs-odl-ha.yaml
Simple merge

diff --cc ci/odl/juju-deployer/ovs-odl-tip.yaml
Simple merge

diff --cc ci/odl/juju-deployer/ovs-odl.yaml
Simple merge

diff --cc ci/onos/juju-deployer/onos-ha.yaml
Simple merge

diff --cc ci/onos/juju-deployer/onos-tip.yaml
Simple merge

diff --cc ci/onos/juju-deployer/onos.yaml
Simple merge

diff --cc ci/opencontrail/juju-deployer/contrail-ha.yaml
Simple merge

diff --cc ci/opencontrail/juju-deployer/contrail-tip.yaml
Simple merge

diff --cc ci/opencontrail/juju-deployer/contrail.yaml
Simple merge