From b3bf680fb7d316dcde37898cf774f660a8c5f258 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 9 Apr 2019 16:32:29 -0600 Subject: [PATCH] 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 --- environments/undercloud.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 7dfaf0403a..77d8fefd31 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -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