starlingx
/
config
Code Issues Proposed changes

Merge "Remove support for helmv2 database migration"

This commit is contained in:
Zuul 2023-09-22 19:44:49 +00:00 committed by Gerrit Code Review
parent 5ac2fd39ef 0f183054db
commit f75c8ffc64
3 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
View File

@ -27,13 +27,12 @@ LOG = log.getLogger(__name__)
def get_upgrade_databases(system_role, shared_services):
UPGRADE_DATABASES = ('postgres', 'template1', 'sysinv',
'barbican', 'fm', 'helmv2')
'barbican', 'fm')
UPGRADE_DATABASE_SKIP_TABLES = {'postgres': (), 'template1': (),
'sysinv': (),
'barbican': (),
'fm': ('alarm',),
'helmv2': ()}
'fm': ('alarm',)}
if system_role == sysinv_constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER:
UPGRADE_DATABASES += ('dcmanager', 'dcorch',)

1
sysinv/sysinv/sysinv/setup.cfg
View File

@ -66,7 +66,6 @@ systemconfig.puppet_plugins =
034_barbican = sysinv.puppet.barbican:BarbicanPuppet
035_dockerdistribution = sysinv.puppet.dockerdistribution:DockerDistributionPuppet
038_certmon = sysinv.puppet.certmon:CertMonPuppet
039_helm = sysinv.puppet.helm:HelmPuppet
040_rook = sysinv.puppet.rook:RookPuppet
041_certalarm = sysinv.puppet.certalarm:CertAlarmPuppet
042_sssd = sysinv.puppet.sssd:SssdPuppet

25
sysinv/sysinv/sysinv/sysinv/puppet/helm.py
View File

@ -1,25 +0,0 @@
#
# Copyright (c) 2020 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
from sysinv.puppet import base
class HelmPuppet(base.BasePuppet):
"""Class to encapsulate puppet operations for helm configuration"""
SERVICE_NAME = 'helmv2'
def get_static_config(self):
dbuser = self._get_database_username(self.SERVICE_NAME)
return {
'platform::helm::v2::db::postgresql::user': dbuser,
}
def get_secure_static_config(self):
dbpass = self._get_database_password(self.SERVICE_NAME)
return {
'platform::helm::v2::db::postgresql::password': dbpass,
}