Skip to content

Commit cb50768

Browse files
author
Ladislav CABELKA
committed
pulse2-setup: set config and handle CM service
1 parent 1bfe780 commit cb50768

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

pulse2/services/bin/pulse2-setup

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ class Service(object):
290290
name = None
291291
clsnames = [ 'SrvMmcAgent',
292292
'SrvInventoryserver', 'SrvLauncher', 'SrvPkgServer',
293-
'SrvScheduler' ]
293+
'SrvScheduler', 'SrvConnectionManager' ]
294294

295295
def __init__(self, handler, config):
296296
self.config = config
@@ -368,6 +368,9 @@ class SrvPkgServer(Service):
368368
class SrvScheduler(Service):
369369
name = 'pulse2-scheduler'
370370

371+
class SrvConnectionManager(Service):
372+
name = 'pulse2-cm'
373+
371374

372375
def apply_conf_diff(origin, current, only_override=False):
373376
"""
@@ -436,7 +439,7 @@ class Pulse2ConfigFile(object):
436439
clsnames = [ 'PluginsPkgConfig', 'PluginsImagingConfig', 'PluginsGlpiConfig',
437440
'PluginsBaseConfig', 'PluginsDyngroupConfig', 'PluginsInventoryConfig',
438441
'PluginsPulse2Config', 'PluginsMscConfig', 'PluginsBackuppcConfig', 'InventoryServerConfig',
439-
'LaunchersConfig', 'PackageServerConfig', 'SchedulerConfig',
442+
'LaunchersConfig', 'PackageServerConfig', 'SchedulerConfig', 'CMConfig',
440443
'MMCAgentConfig', 'UUIDResolverConfig' , 'PluginsReportConfig', 'PluginsUpdateConfig', 'PluginsMonitoringConfig']
441444
path = None
442445
# If defaults is None, try to read default values from config file in
@@ -650,6 +653,10 @@ class SchedulerConfig(LoggingConfig):
650653
path = 'pulse2/scheduler/scheduler.ini'
651654
log_path = 'pulse2-scheduler.log'
652655

656+
class CMConfig(LoggingConfig):
657+
path = 'pulse2/cm/cm.ini'
658+
log_path = 'pulse2-cm.log'
659+
653660
class UUIDResolverConfig(Pulse2ConfigFile):
654661
path = 'pulse2/uuid-resolver/uuid-resolver.ini'
655662

@@ -862,6 +869,9 @@ class SetupApp(object):
862869
self.confs['plugins/base.ini'].set('ldap', 'password', self.config['ldappasswd'])
863870
self.confs['plugins/base.ini'].set('ldap', 'defaultUserGroup', self.config['defaultUserGroup'])
864871

872+
# LDAP password for Connection Manager
873+
self.confs['pulse2/cm/cm.ini'].set('mmc', 'ldap_passwd', self.config['ldappasswd'])
874+
865875
# LDAP password for UUID resolver
866876
self.confs['pulse2/uuid-resolver/uuid-resolver.ini'].set('ldap', 'password', self.config['ldappasswd'])
867877

0 commit comments

Comments
 (0)