From 1d362b157e2c05323eee764a2a183d0c1714ec71 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 29 Aug 2022 00:20:42 +0900 Subject: [PATCH] Ubuntu: Purge the default policy.yaml for Placement The policy.yaml file provided by the UCA package contains wrong modifications since Xena, which is causing consistent API error. This change makes sure the file is purged in Ubuntu to workaround the problem. This change will be reverted once the package file is fixed. Related-Bug: #1987984 Change-Id: I9e6e91c065f994433c9b92d9b84e7c1e6d61f3e5 (cherry picked from commit 71197c85813f400043e5dbf4106b2e127a980a1e) --- manifests/placement.pp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manifests/placement.pp b/manifests/placement.pp index db9f246e4..8f3d7817f 100644 --- a/manifests/placement.pp +++ b/manifests/placement.pp @@ -42,6 +42,12 @@ class openstack_integration::placement { database_connection => 'mysql+pymysql://placement:placement@127.0.0.1/placement?charset=utf8', } include placement::db::sync + # TODO(tkajinam): Remove this once lp bug 1987984 is fixed. + if $::operatingsystem == 'Ubuntu' { + class { 'placement::policy': + purge_config => true + } + } include placement::api include apache if ($::operatingsystem != 'Debian') {