From 749e90145896c612d7e7bf2f239f342874aab743 Mon Sep 17 00:00:00 2001 From: Hugo Nicodemos Date: Fri, 16 Feb 2024 17:04:06 +0000 Subject: [PATCH] Revert "Add use_usm parameter to dcorch.conf" This reverts commit 58cd7e1117782a9095186e1f7590715e8f174a85. Reason for revert: The use_usm parameter is no longer needed; we have a new CLI command to execute USM. Change-Id: I69e7962bca988d268b6cad508d495cbfa8833d86 --- modules/puppet-dcmanager/src/dcmanager/manifests/init.pp | 1 - modules/puppet-dcorch/src/dcorch/manifests/init.pp | 6 ------ 2 files changed, 7 deletions(-) diff --git a/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp b/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp index 324641d13..08a5c4933 100644 --- a/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp +++ b/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp @@ -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, diff --git a/modules/puppet-dcorch/src/dcorch/manifests/init.pp b/modules/puppet-dcorch/src/dcorch/manifests/init.pp index d9e3d16da..fde1ad606 100644 --- a/modules/puppet-dcorch/src/dcorch/manifests/init.pp +++ b/modules/puppet-dcorch/src/dcorch/manifests/init.pp @@ -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:')