(mitaka only) Fix sysctl_settings configuration
sysctl settings are already managed in puppet-tripleo/manifests/loadbalancer.pp (stable/mitaka only) so we only want to set them when service_certificate is set to undef (SSL disabled) otherwise the loadbalancer class will do it for us. This is a Mitaka patch only because in master we use composable services and don't have this problem. Change-Id: I6938ea5f80badde3cb75d64012a1187061fa7fd0
This commit is contained in:
parent
e716914033
commit
1375d1da8e
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
create_resources(sysctl::value, hiera('sysctl_settings'), { })
|
||||
|
||||
if count(hiera('ntp::servers')) > 0 {
|
||||
include ::ntp
|
||||
}
|
||||
|
@ -438,6 +436,11 @@ if hiera('service_certificate', undef) {
|
|||
ironic => true,
|
||||
rabbitmq => true,
|
||||
}
|
||||
} else {
|
||||
# sysctl_settings are set in puppet-tripleo/loadbalancer.pp
|
||||
# so to avoid a duplicated resource we need to set it here manually only
|
||||
# when we don't have service_certificate parameter.
|
||||
create_resources(sysctl::value, hiera('sysctl_settings'), { })
|
||||
}
|
||||
|
||||
if str2bool(hiera('enable_tempest', true)) {
|
||||
|
|
Loading…
Reference in New Issue