diff --git a/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp b/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp index dded74403..01b472642 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:')