From 34fad736aa3232050c4de129d23f0aae813b8e4c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 Nov 2023 20:31:18 +0900 Subject: [PATCH] Revert "Ubuntu: Purge the default policy.yaml for Placement" This reverts commit 71197c85813f400043e5dbf4106b2e127a980a1e. Conflicts: manifests/placement.pp Reason for revert: The original bug 1987984 turned out to be a duplicate of bug 1945336, which was already fixed. Related-Bug: #1945336 Related-Bug: #1987984 Change-Id: I808535454985764a94434443633fde7997ab1d21 --- manifests/placement.pp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/manifests/placement.pp b/manifests/placement.pp index 296bc2dc2..f26e04f83 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -54,12 +54,6 @@ class openstack_integration::placement { }), } include placement::db::sync - # TODO(tkajinam): Remove this once lp bug 1987984 is fixed. - if $facts['os']['name'] == 'Ubuntu' { - class { 'placement::policy': - purge_config => true - } - } include placement::api if ($facts['os']['name'] != 'Debian') { class { 'placement::wsgi::apache':