openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Alex Schultz 2019-04-09 16:32:29 -06:00 committed by Michele Baldessari
parent 4743b7631f
commit b3bf680fb7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
environments/undercloud.yaml
View File

@ -42,6 +42,18 @@ resource_registry:
OS::TripleO::Services::CinderScheduler: OS::Heat::None
OS::TripleO::Services::CinderVolume: OS::Heat::None
# Services we don't ever want configured. See LP#1824030
OS::TripleO::Services::Pacemaker: OS::Heat::None
OS::TripleO::Services::PacemakerRemote: OS::Heat::None
OS::TripleO::Services::Clustercheck: OS::Heat::None
# Ensure non-pacemaker versions. See LP#1824030
# CinderVolume is set to None above and OVNdbs is currently not in the list in role_data_undercloud.yaml so
# avoiding that as well until the UC switches to OVN
OS::TripleO::Services::MySQL: ../deployment/database/mysql-container-puppet.yaml
OS::TripleO::Services::OsloMessagingRpc: ../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
OS::TripleO::Services::OsloMessagingNotify: ../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
# Enable Podman on the Undercloud.
# This line will drop in Stein when it becomes the default.
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml