2 Commits

Author SHA1 Message Date
Bogdan Dobrelya
6c5f2b8f69 Delete not-used services-docker files
The services-docker env files now all reside in
services and became defaults. We need to delete those
copies to not allow desync of contents.

Depends-On: I48dd13dd574147950a8f20f39b8f5c84ca7d2c6c
Depends-On: I1e264a03b10c1a5244e9a604c45c608c19037827

Change-Id: I0c343e3dd01ad864bad8c7632261c9db4b28b5df
2018-04-10 09:33:14 +02:00
Dan Prince
e691bbe026 Default environment/services/* to docker
This updates the relevant environment/services templates so that
they also default to docker. Without this change users of these
services could end up with mismatched (unsupported) deployments.

Additionally, this picks environment/services-docker as the
source of truth when resolving collisions for moving those over
environment/services. So environment/services now contain all of
the containerized services' env files used to be located in
environment/services-docker. The latter will be deleted later to
prevent future desync of contents.

Co-authored-by: Bogdan Dobrelya <bdobreli@redhat.com>
Change-Id: I923731f46ea26582160a11d2dfe85792ab74110b
2018-03-27 11:24:08 +02:00