This change combines the previous puppet and docker files into a single
file that performs the docker service installation and configuration.
With this patch the baremetal version of haproxy services has been removed.
Since we're aligning the overcloud/undercloud and we've switched to
containerization it, we should reuse the same heat services rather than
duplicating the services with the Undercloud definition.
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 <firstname.lastname@example.org>
Co-Authored-By: Juan Antonio Osorio Robles <email@example.com>
Co-Authored-By: Dan Prince <firstname.lastname@example.org>
Co-Authored-By: Ian Main <email@example.com>