Remove support for helmv2 database migration
This change removes the helmv2 database migration from the upgrade
process. It aims to equalize the upgrade behavior across simplex and
multinode loads.
The helmv2 database migration was removed from simplex upgrades on this
commit: a6d51ad9bb
In addition to that, the references to the helmv2 database need to be
removed from controllerconfig and sysinv in order to fully remove its
support and prevent it from being migrated on multinode scenarios.
This will only have effect for upgrades from stx-9 onwards as
the code changed is executed during the upgrade-start phase.
Test Plan:
PASS: build-pkgs && build-image
PASS: Check if AIO-SX fresh install was not affected
PASS: Check if AIO-DX fresh install was not affected
Story: 48480
Task: 2010560
Change-Id: I45568ddc05d6f8f1450bac752b9cb79e0fab5f79
Signed-off-by: Igor Soares <Igor.PiresSoares@windriver.com>
This commit is contained in:
parent
7f0341759a
commit
0f183054db
|
@ -27,13 +27,12 @@ LOG = log.getLogger(__name__)
|
||||||
def get_upgrade_databases(system_role, shared_services):
|
def get_upgrade_databases(system_role, shared_services):
|
||||||
|
|
||||||
UPGRADE_DATABASES = ('postgres', 'template1', 'sysinv',
|
UPGRADE_DATABASES = ('postgres', 'template1', 'sysinv',
|
||||||
'barbican', 'fm', 'helmv2')
|
'barbican', 'fm')
|
||||||
|
|
||||||
UPGRADE_DATABASE_SKIP_TABLES = {'postgres': (), 'template1': (),
|
UPGRADE_DATABASE_SKIP_TABLES = {'postgres': (), 'template1': (),
|
||||||
'sysinv': (),
|
'sysinv': (),
|
||||||
'barbican': (),
|
'barbican': (),
|
||||||
'fm': ('alarm',),
|
'fm': ('alarm',)}
|
||||||
'helmv2': ()}
|
|
||||||
|
|
||||||
if system_role == sysinv_constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER:
|
if system_role == sysinv_constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER:
|
||||||
UPGRADE_DATABASES += ('dcmanager', 'dcorch',)
|
UPGRADE_DATABASES += ('dcmanager', 'dcorch',)
|
||||||
|
|
|
@ -66,7 +66,6 @@ systemconfig.puppet_plugins =
|
||||||
034_barbican = sysinv.puppet.barbican:BarbicanPuppet
|
034_barbican = sysinv.puppet.barbican:BarbicanPuppet
|
||||||
035_dockerdistribution = sysinv.puppet.dockerdistribution:DockerDistributionPuppet
|
035_dockerdistribution = sysinv.puppet.dockerdistribution:DockerDistributionPuppet
|
||||||
038_certmon = sysinv.puppet.certmon:CertMonPuppet
|
038_certmon = sysinv.puppet.certmon:CertMonPuppet
|
||||||
039_helm = sysinv.puppet.helm:HelmPuppet
|
|
||||||
040_rook = sysinv.puppet.rook:RookPuppet
|
040_rook = sysinv.puppet.rook:RookPuppet
|
||||||
041_certalarm = sysinv.puppet.certalarm:CertAlarmPuppet
|
041_certalarm = sysinv.puppet.certalarm:CertAlarmPuppet
|
||||||
042_sssd = sysinv.puppet.sssd:SssdPuppet
|
042_sssd = sysinv.puppet.sssd:SssdPuppet
|
||||||
|
|
|
@ -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,
|
|
||||||
}
|
|
Loading…
Reference in New Issue