Don't pass puppet-pacemaker.yaml to containerized HA envs
This shouldn't change functionality, as container_args would override
values from this env file when both containerized_overcloud and
enable_pacemaker are set to true. However, we wouldn't be recommending
users to deploy with both `-e puppet-pacemaker.yaml -e docker-ha.yaml`
at the same time, so we shouldn't be passing it like that in OOOQ
either.
The change is from a patch by Wes [1], instead of which we merged a
different patch in the end, but i believe we still need at least this
part from it.
Reviewed: https:/ /review. openstack. org/497485 /git.openstack. org/cgit/ openstack/ tripleo- quickstart- extras/ commit/ ?id=1a97e78f471 3e70974be6f361a 325cd2a224e762
Committed: https:/
Submitter: Jenkins
Branch: master
commit 1a97e78f4713e70 974be6f361a325c d2a224e762
Author: Jiri Stransky <email address hidden>
Date: Thu Aug 24 18:32:41 2017 +0200
Don't pass puppet- pacemaker. yaml to containerized HA envs
This shouldn't change functionality, as container_args would override overcloud and pacemaker are set to true. However, we wouldn't be recommending pacemaker. yaml -e docker-ha.yaml`
values from this env file when both containerized_
enable_
users to deploy with both `-e puppet-
at the same time, so we shouldn't be passing it like that in OOOQ
either.
The change is from a patch by Wes [1], instead of which we merged a
different patch in the end, but i believe we still need at least this
part from it.
[1] https:/ /review. openstack. org/491146
Change-Id: I9e0858b5cee8d1 4e69f218cd99570 79787b92db8
Co-Authored-By: Wesley Hayutin <email address hidden>
Related-Bug: #1712070