adding docker-ha.yaml to the plan-environment.yaml breaks the undercloud

[Alex Schultz]

If you update the default plan-environment.yaml to include the environments/docker-ha.yaml, the undercloud installation fails because it tries to use the pacemaker versions of rabbitmq/mariadb. Prior to stein, we included the environments/docker.yaml in the deploy command which unconfigured the items configured in docker-ha.yaml. We need to add the non-pacemaker configuration into the undercloud.yaml environment so inclusion of docker-ha.yaml in the plan doesn't trigger a pacemaker enabled undercloud config. The undercloud role doesn't have pacemaker so the services can't be properly configured.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/651403

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/651403
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=b3bf680fb7d316dcde37898cf774f660a8c5f258
Submitter: Zuul
Branch: master

commit b3bf680fb7d316dcde37898cf774f660a8c5f258
Author: Alex Schultz <email address hidden>
Date: Tue Apr 9 16:32:29 2019 -0600

    Ensure non-pacemaker versions for undercloud

    If the plan-environment.yaml includes docker-ha.yaml by default, the
    pacemaker version of some services get enabled for the undercloud. Let
    us be more explicit about these services in the undercloud environment
    file to ensure we get the right version configured always.

    Change-Id: I806f95e3b4988b0f3c427a652cdd6ea39154798a
    Closes-Bug: #1824030

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 10.5.0 release.