Merge "Remove bgp-vpn from scenario004-multinode-containers" into stable/pike

diff --cc ci/environments/scenario004-multinode-containers.yaml
index 3297fbf,41ef224..e2be75c
--- 1/ci/environments/scenario004-multinode-containers.yaml
--- 2/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@@ -16,10 -16,8 +16,8 @@@ resource_registry
    OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
    OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml
    OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml
 -  OS::TripleO::Services::ManilaShare: ../../docker/services/manila-share.yaml
 +  OS::TripleO::Services::ManilaShare: ../../docker/services/pacemaker/manila-share.yaml
    OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
-   # TODO: containerize NeutronBgpVpnApi
-   OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml
    # NOTE: This is needed because of upgrades from Ocata to Pike. We
    # deploy the initial environment with Ocata templates, and
    # overcloud-resource-registry.yaml there doesn't have this Docker