Merge pull request #242 from uyuni-project/migration_fix

Migration fix
uyuni-project · Apr 16, 2024 · 6e1326a · 6e1326a
2 parents 3fa1d23 + 16090c5
commit 6e1326a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/mgradm/cmd/migrate/podman/utils.go b/mgradm/cmd/migrate/podman/utils.go
@@ -39,7 +39,6 @@ func migrateToPodman(globalFlags *types.GlobalFlags, flags *podmanMigrateFlags,
 	}
 
 	if oldPgVersion != newPgVersion {
-		log.Info().Msgf("Previous postgresql is %s, instead new one is %s. Performing a DB version upgrade...", oldPgVersion, newPgVersion)
 		if err := podman.RunPgsqlVersionUpgrade(flags.Image, flags.MigrationImage, oldPgVersion, newPgVersion); err != nil {
 			return fmt.Errorf("cannot run PostgreSQL version upgrade script: %s", err)
 		}

diff --git a/mgradm/cmd/upgrade/podman/utils.go b/mgradm/cmd/upgrade/podman/utils.go
@@ -45,7 +45,6 @@ func upgradePodman(globalFlags *types.GlobalFlags, flags *podmanUpgradeFlags, cm
 		err = shared_podman.StartService(shared_podman.ServerService)
 	}()
 	if inspectedValues["image_pg_version"] > inspectedValues["current_pg_version"] {
-		log.Info().Msgf("Previous postgresql is %s, instead new one is %s. Performing a DB version upgrade...", inspectedValues["current_pg_version"], inspectedValues["image_pg_version"])
 		if err := podman.RunPgsqlVersionUpgrade(flags.Image, flags.MigrationImage, inspectedValues["current_pg_version"], inspectedValues["image_pg_version"]); err != nil {
 			return fmt.Errorf("cannot run PostgreSQL version upgrade script: %s", err)
 		}

diff --git a/mgradm/shared/templates/pgsqlVersionUpgradeScriptTemplate.go b/mgradm/shared/templates/pgsqlVersionUpgradeScriptTemplate.go
@@ -33,7 +33,7 @@ chown -R postgres:postgres /etc/pki/tls/certs/spacewalk.crt
 
 echo "Initialize new postgresql $NEW_VERSION database..."
 . /etc/sysconfig/postgresql 2>/dev/null # Load locale for SUSE
-PGHOME=$(getent passwd postgres | awk -F: '{print $6}')
+PGHOME=$(getent passwd postgres | cut -d ":" -f6)
 #. $PGHOME/.i18n 2>/dev/null # Load locale for Enterprise Linux
 if [ -z $POSTGRES_LANG ]; then
     POSTGRES_LANG="en_US.UTF-8"

diff --git a/mgradm/shared/templates/postUpgradeScriptTemplate.go b/mgradm/shared/templates/postUpgradeScriptTemplate.go
@@ -16,7 +16,7 @@ grep uyuni_authentication_endpoint /etc/cobbler/settings.yaml
 if [ $? -eq 1 ]; then
 	echo 'uyuni_authentication_endpoint: "http://localhost"' >> /etc/cobbler/settings.yaml
 else
-	sed 's/uyuni_authentication_endpoint.*/spacewalk_authentication_endpoint: http:\/\/localhost/' -i /etc/cobbler/settings.yaml;
+	sed 's/uyuni_authentication_endpoint.*/uyuni_authentication_endpoint: http:\/\/localhost/' -i /etc/cobbler/settings.yaml;
 fi
 {{ end }}
 `

diff --git a/uyuni-tools.changes.cbosdo.migration_fix b/uyuni-tools.changes.cbosdo.migration_fix
@@ -0,0 +1,3 @@
+- Fix wrong cobbler spacewalk_authentication_endpoint property 
+  after upgrade or migration
+- Fix migration script using awk missing in migration image