Disable SSL during DB split

Author: mbussolotto

mgradm/shared/podman/podman.go

@@ -585,22 +585,6 @@ func RunSplitContainerSettings(serverImage string, dbHost string, reportDBHost s
 		[]string{"bash", "-e", "-c", scriptBuilder.String()})
 }
 
-// RunConfigPgsl setup postgres container.
-func RunConfigPgsl(pgsqlImage string) error {
-	podmanArgs := []string{
-		"--security-opt", "label=disable",
-		"--secret", fmt.Sprintf("%s,type=mount,target=%s", podman.DBCASecret, ssl.DBCAContainerPath),
-		"--secret", fmt.Sprintf("%s,type=mount,uid=999,mode=0400,target=%s", podman.DBSSLKeySecret, ssl.DBCertKeyPath),
-		"--secret", fmt.Sprintf("%s,type=mount,target=%s", podman.DBSSLCertSecret, ssl.DBCertPath),
-		"--entrypoint", "/docker-entrypoint-initdb.d/uyuni-postgres-config.sh",
-	}
-	if err := podman.RunContainer("uyuni-db-config", pgsqlImage, utils.PgsqlRequiredVolumeMounts,
-		podmanArgs, []string{}); err != nil {
-		return err
-	}
-	return systemd.RestartService(podman.DBService)
-}
-
 // CallCloudGuestRegistryAuth calls cloudguestregistryauth if it is available.
 func CallCloudGuestRegistryAuth() error {
 	cloudguestregistryauth := "cloudguestregistryauth"
@@ -729,5 +713,5 @@ func configureDBContainer(
 			db.Host,
 		)
 	}
-	return RunConfigPgsl(pgsqlImage)
+	return nil
 }

mgradm/shared/templates/pgsqlMigrateScriptTemplate.go

@@ -15,10 +15,12 @@ set -e -x
 
 {{ if .ReportDBHost }}
 sed 's/^report_db_host = .*/report_db_host = {{ .ReportDBHost }}/' -i /etc/rhn/rhn.conf;
+sed 's/^report_db_ssl_enabled = .*/report_db_ssl_enabled = 0/' -i /etc/rhn/rhn.conf;
 {{ end }}
 
 {{ if .DBHost }}
 sed 's/^db_host = .*/db_host = {{ .DBHost }}/' -i /etc/rhn/rhn.conf;
+sed 's/^db_ssl_enabled = .*/db_ssl_enabled = 0/' -i /etc/rhn/rhn.conf;
 {{ end }}
 
 echo "DONE"`

uyuni-tools.changes.mbussolotto.single_pg_hba_conf

@@ -0,0 +1,2 @@
+- Disable SSL on db during split (bsc#12099).
+- Do not call uyuni-postgres-config.sh in mgradm (bsc#12099).