From: Jenkins Date: Tue, 5 Sep 2017 09:10:42 +0000 (+0000) Subject: Merge "Remove bgp-vpn from scenario004-multinode-containers" into stable/pike X-Git-Tag: opnfv-6.0.0~149 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9f408dbe8bc8371424ecb816877b1cfe62498f8d;p=apex-tripleo-heat-templates.git Merge "Remove bgp-vpn from scenario004-multinode-containers" into stable/pike --- 9f408dbe8bc8371424ecb816877b1cfe62498f8d diff --cc ci/environments/scenario004-multinode-containers.yaml index 3297fbf5,41ef224c..e2be75cc --- a/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