diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-27 20:54:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-27 20:54:34 +0000 |
| commit | f808c7e114e27cbaf083c7acb6ba930272f8591e (patch) | |
| tree | e76cad6c7c4aca3cfb7e8608927f957d76ceaab8 /ci/environments/scenario006-multinode-containers.yaml | |
| parent | 18edc60b2effe2d0d5ebb8d74a206085708934a4 (diff) | |
| parent | 682686e66b379ab5a04b5cc0752048fb6d2e5100 (diff) | |
Merge "Stop mapping docker to OS::Heat::None in scenarios" into stable/pike
Diffstat (limited to 'ci/environments/scenario006-multinode-containers.yaml')
| -rw-r--r-- | ci/environments/scenario006-multinode-containers.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml index d0a952d5..025fd81e 100644 --- a/ci/environments/scenario006-multinode-containers.yaml +++ b/ci/environments/scenario006-multinode-containers.yaml @@ -5,7 +5,6 @@ resource_registry: OS::TripleO::Services::IronicApi: ../docker/services/ironic-api.yaml OS::TripleO::Services::IronicConductor: ../docker/services/ironic-conductor.yaml OS::TripleO::Services::IronicPxe: ../docker/services/ironic-pxe.yaml - OS::TripleO::Services::Docker: OS::Heat::None parameter_defaults: ControllerServices: |