Heat: Manage policy settings in heat-engine
The heat-engine service requires access to policy rules so that it can enforce resource type policies. This change ensures the policy file and the related oslo.policy options are configured in the heat-engine service. Conflicts: manifests/profile/base/heat/engine.pp Resolved conflicts caused by absolute class names used in stable/train. We replaced absolute class names by relative class names during ussuri cycle following the updated lint rules. Change-Id: I56511722315f265c6a88c2e112571fe70b6cebf4 Partial-Bug: #1983342 (cherry picked from commitb58a5dcb1c
) (cherry picked from commitba98821216
)
This commit is contained in:
parent
2280e408e0
commit
6347422fde
@ -41,6 +41,7 @@ class tripleo::profile::base::heat::engine (
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $sync_db ) {
|
||||
include ::heat::engine
|
||||
include ::heat::policy
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -41,6 +41,7 @@ eos
|
||||
is_expected.to contain_class('tripleo::profile::base::heat::engine')
|
||||
is_expected.to contain_class('tripleo::profile::base::heat')
|
||||
is_expected.to_not contain_class('heat::engine')
|
||||
is_expected.to_not contain_class('heat::policy')
|
||||
}
|
||||
end
|
||||
|
||||
@ -54,6 +55,7 @@ eos
|
||||
is_expected.to contain_class('tripleo::profile::base::heat::engine')
|
||||
is_expected.to contain_class('tripleo::profile::base::heat')
|
||||
is_expected.to contain_class('heat::engine')
|
||||
is_expected.to contain_class('heat::policy')
|
||||
}
|
||||
end
|
||||
|
||||
@ -67,6 +69,7 @@ eos
|
||||
is_expected.to contain_class('tripleo::profile::base::heat::engine')
|
||||
is_expected.to contain_class('tripleo::profile::base::heat')
|
||||
is_expected.to_not contain_class('heat::engine')
|
||||
is_expected.to_not contain_class('heat::policy')
|
||||
}
|
||||
end
|
||||
|
||||
@ -80,6 +83,7 @@ eos
|
||||
is_expected.to contain_class('tripleo::profile::base::heat::engine')
|
||||
is_expected.to contain_class('tripleo::profile::base::heat')
|
||||
is_expected.to contain_class('heat::engine')
|
||||
is_expected.to contain_class('heat::policy')
|
||||
}
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user