diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-26 06:19:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-26 06:19:09 +0000 |
| commit | 963d1b3db6c76434f8ca4079a31336afb64b11d2 (patch) | |
| tree | 4a387b91d71dabd8ab24921cd5aa04e8370e2ef7 /ci/environments | |
| parent | 8071beda51cdb71009ed071b36843b57a06d895b (diff) | |
| parent | 2fddc77c338c766ad6a5e9fea0257b8ea16dd8b8 (diff) | |
Merge "Add containerized manila-share to CI"
Diffstat (limited to 'ci/environments')
| -rw-r--r-- | ci/environments/scenario004-multinode-containers.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index b94a7f74..6d795f97 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 |