starlingx/stx-puppet
Code Issues Proposed changes

Merge "Revert "Add use_usm parameter to dcorch.conf""

Browse Source
This commit is contained in:
Zuul 2024-03-13 14:44:37 +00:00 committed by Gerrit Code Review
commit aae3c5ad5e
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/puppet-dcmanager/src/dcmanager/manifests/init.pp
View File

@ -21,7 +21,6 @@
# TODO(kmacleod): playbook_timeout should be exposed to persist and modify
# via 'system service-parameter...'
# TODO(cdeolive): remove use_usm parameter when usm is fully integrated
class dcmanager (
$database_connection = '',
$database_idle_timeout = 3600,

6
modules/puppet-dcorch/src/dcorch/manifests/init.pp
View File

@ -59,7 +59,6 @@ class dcorch (
$usm_remote_port = 5497,
$identity_bind_port = 25000,
$identity_remote_port = 5000,
$use_usm = false
) {
include dcorch::params
@ -102,11 +101,6 @@ class dcorch (
'DEFAULT/api_paste_config': value => $api_paste_config;
}
# TODO(cdeolive): remove this parameter when usm is fully integrated
dcorch_config {
'DEFAULT/use_usm': value => $use_usm;
}
# Automatically add psycopg2 driver to postgresql (only does this if it is missing)
$real_connection = regsubst($database_connection,'^postgresql:','postgresql+psycopg2:')