starlingx/stx-puppet
Code Issues Proposed changes

Merge "Enable dcmanager orchestrator's worker service"

Browse Source
This commit is contained in:
Zuul 2025-04-17 19:55:18 +00:00 committed by Gerrit Code Review
commit 2cc88809d9
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
# #
# Files in this package are licensed under Apache; see LICENSE file. # Files in this package are licensed under Apache; see LICENSE file.
# #
# Copyright (c) 2013-2022 Wind River Systems, Inc. # Copyright (c) 2013-2022, 2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -47,6 +47,7 @@ class dcmanager (
$log_levels = 'keystoneauth=ERROR,eventlet.wsgi.server=WARN', $log_levels = 'keystoneauth=ERROR,eventlet.wsgi.server=WARN',
$workers = 1, $workers = 1,
$orch_workers = 1, $orch_workers = 1,
$orch_worker_workers = 2,
$state_workers = 4, $state_workers = 4,
$audit_workers = 1, $audit_workers = 1,
$audit_worker_workers = 4, $audit_worker_workers = 4,
@ -113,6 +114,7 @@ class dcmanager (
dcmanager_config { dcmanager_config {
'DEFAULT/workers': value => $workers; 'DEFAULT/workers': value => $workers;
'DEFAULT/orch_workers': value => $orch_workers; 'DEFAULT/orch_workers': value => $orch_workers;
'DEFAULT/orch_worker_workers': value => $orch_worker_workers;
'DEFAULT/state_workers': value => $state_workers; 'DEFAULT/state_workers': value => $state_workers;
'DEFAULT/audit_workers': value => $audit_workers; 'DEFAULT/audit_workers': value => $audit_workers;
'DEFAULT/audit_worker_workers': value => $audit_worker_workers; 'DEFAULT/audit_worker_workers': value => $audit_worker_workers;

8
puppet-manifests/src/modules/platform/manifests/dcmanager.pp
View File

@ -10,6 +10,7 @@ class platform::dcmanager::params (
$deploy_base_dir = '/opt/platform/deploy', $deploy_base_dir = '/opt/platform/deploy',
$iso_base_dir_source = '/opt/platform/iso', $iso_base_dir_source = '/opt/platform/iso',
$iso_base_dir_target = '/var/www/pages/iso', $iso_base_dir_target = '/var/www/pages/iso',
$orch_worker_workers = undef,
$state_workers = undef, $state_workers = undef,
$audit_worker_workers = undef, $audit_worker_workers = undef,
$rabbit_host = 'localhost', $rabbit_host = 'localhost',
@ -78,12 +79,19 @@ class platform::dcmanager
$audit_worker_workers_value = $::platform::dcmanager::params::audit_worker_workers $audit_worker_workers_value = $::platform::dcmanager::params::audit_worker_workers
} }
if $::platform::dcmanager::params::orch_worker_workers == undef {
$orch_worker_workers_value = min($::platform::params::eng_workers_by_2, 4)
} else {
$orch_worker_workers_value = $::platform::dcmanager::params::orch_worker_workers
}
class { '::dcmanager': class { '::dcmanager':
rabbit_host => $::platform::dcmanager::params::rabbit_host, rabbit_host => $::platform::dcmanager::params::rabbit_host,
rabbit_port => $::platform::amqp::params::port, rabbit_port => $::platform::amqp::params::port,
rabbit_userid => $::platform::amqp::params::auth_user, rabbit_userid => $::platform::amqp::params::auth_user,
rabbit_password => $::platform::amqp::params::auth_password, rabbit_password => $::platform::amqp::params::auth_password,
state_workers => $state_workers_value, state_workers => $state_workers_value,
orch_worker_workers => $orch_worker_workers_value,
audit_worker_workers => $audit_worker_workers_value, audit_worker_workers => $audit_worker_workers_value,
} }
file {$iso_base_dir_source: file {$iso_base_dir_source:

9
puppet-manifests/src/modules/platform/manifests/sm.pp
View File

@ -1337,6 +1337,12 @@ class platform::sm
-> exec { 'Provision DCManager-Orchestrator in SM (service dcmanager-orchestrator)': -> exec { 'Provision DCManager-Orchestrator in SM (service dcmanager-orchestrator)':
command => 'sm-provision service dcmanager-orchestrator', command => 'sm-provision service dcmanager-orchestrator',
} }
-> exec { 'Provision DCManager-Orchestrator-Worker (service-group-member dcmanager-orchestrator-worker)':
command => 'sm-provision service-group-member distributed-cloud-services dcmanager-orchestrator-worker',
}
-> exec { 'Provision DCManager-Orchestrator-Worker in SM (service dcmanager-orchestrator-worker)':
command => 'sm-provision service dcmanager-orchestrator-worker',
}
-> exec { 'Provision DCManager-RestApi (service-group-member dcmanager-api)': -> exec { 'Provision DCManager-RestApi (service-group-member dcmanager-api)':
command => 'sm-provision service-group-member distributed-cloud-services dcmanager-api', command => 'sm-provision service-group-member distributed-cloud-services dcmanager-api',
} }
@ -1409,6 +1415,9 @@ class platform::sm
-> exec { 'Configure Platform - DCManager-Orchestrator': -> exec { 'Configure Platform - DCManager-Orchestrator':
command => "sm-configure service_instance dcmanager-orchestrator dcmanager-orchestrator \"\"", command => "sm-configure service_instance dcmanager-orchestrator dcmanager-orchestrator \"\"",
} }
-> exec { 'Configure Platform - DCManager-Orchestrator-Worker':
command => "sm-configure service_instance dcmanager-orchestrator-worker dcmanager-orchestrator-worker \"\"",
}
-> exec { 'Configure OpenStack - DCManager-API': -> exec { 'Configure OpenStack - DCManager-API':
command => "sm-configure service_instance dcmanager-api dcmanager-api \"\"", command => "sm-configure service_instance dcmanager-api dcmanager-api \"\"",
} }