Revert "Ubuntu: Purge the default policy.yaml for Placement"
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:
parent
dd451d9a5b
commit
34fad736aa
@ -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':
|
||||
|
Loading…
Reference in New Issue
Block a user