openstack/puppet-openstack-integration
Code Issues Proposed changes

Revert "Ubuntu: Purge the default policy.yaml for Placement"

Browse Source 
This reverts commit 71197c8581.

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
This commit is contained in:
Takashi Kajinami 2023-11-08 20:31:18 +09:00
parent dd451d9a5b
commit 34fad736aa
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/placement.pp
View File

@ -54,12 +54,6 @@ class openstack_integration::placement {
}), }),
} }
include placement::db::sync 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 include placement::api
if ($facts['os']['name'] != 'Debian') { if ($facts['os']['name'] != 'Debian') {
class { 'placement::wsgi::apache': class { 'placement::wsgi::apache':