diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2017-09-27 11:15:35 +0200 |
|---|---|---|
| committer | Jiri Stransky <jistr@redhat.com> | 2017-09-27 17:50:31 +0200 |
| commit | 682686e66b379ab5a04b5cc0752048fb6d2e5100 (patch) | |
| tree | c225f7c45c957f1b8fac80b98aeea5d77002932a /ci/environments/scenario001-multinode-containers.yaml | |
| parent | 72e5ec2a136bed7db610be2cb9af7fb510d536f8 (diff) | |
Stop mapping docker to OS::Heat::None in scenarios
This was needed to make the upgrade job on Ocata->Pike passing, and we
now need to remove this to improve the argument order in OOOQ for
deployments with scenarios.
This shouldn't be backported to Ocata (at least not before we make the
split between deploy scenario and upgrade scenario).
Change-Id: Ie08bbe08530bd48a0ca58667f0704f360e0a4dd7
Co-Authored-By: Martin André <m.andre@redhat.com>
Related-Bug: #1714905
Related-Bug: #1712070
(cherry picked from commit 31550b42027588d82f01db6956c1efaf02d58558)
Diffstat (limited to 'ci/environments/scenario001-multinode-containers.yaml')
| -rw-r--r-- | ci/environments/scenario001-multinode-containers.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index e061c0a5..01c27a95 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -16,12 +16,6 @@ resource_registry: # TODO fluentd is being containerized: https://review.openstack.org/#/c/467072/ OS::TripleO::Services::FluentdClient: ../../puppet/services/logging/fluentd-client.yaml OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.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 - # mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can - # remove this. - OS::TripleO::Services::Docker: OS::Heat::None # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml |