aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorVictoria Martinez de la Cruz <victoria@redhat.com>2017-07-19 16:09:05 -0300
committerVictoria Martinez de la Cruz <victoria@redhat.com>2017-07-19 16:10:12 -0300
commit2fddc77c338c766ad6a5e9fea0257b8ea16dd8b8 (patch)
treed9b0e892b3ad789dca27fe360545217d5bedaa45 /ci
parent80da11d686354fb8dc56aaa3ad66d0ea22373214 (diff)
Add containerized manila-share to CI
Manila Share THT has been merged, so it should be added to the containerized multinode environment in CI. Change-Id: I6bb28e1f5e57b427aafb152d41ec40c807eaa7fa
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/scenario004-multinode-containers.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml
index c2a2331..14d68a2 100644
--- a/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@@ -16,8 +16,7 @@ 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
- # NOTE: being containerized here: https://review.openstack.org/#/c/471527/
- OS::TripleO::Services::ManilaShare: ../../puppet/services/manila-share.yaml
+ OS::TripleO::Services::ManilaShare: ../../docker/services/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