Attach proxy pod to our podman network

mgrpxy/shared/podman/podman.go

@@ -37,6 +37,7 @@ func GenerateSystemdService(httpdImage string, saltBrokerImage string, squidImag
 		Ports:         ports,
 		HttpProxyFile: httpProxyConfig,
 		Args:          strings.Join(podmanArgs, " "),
+		Network:       podman.UyuniNetwork,
 	}
 	if err := generateSystemdFile(dataPod, "pod"); err != nil {
 		return err
@@ -99,7 +100,7 @@ func generateSystemdFile(template utils.Template, service string) error {
 	const systemdPath = "/etc/systemd/system"
 	path := path.Join(systemdPath, name)
 	if err := utils.WriteTemplateToFile(template, path, 0644, true); err != nil {
-		return fmt.Errorf(L("failed to generate systemd file: %s"), path)
+		return fmt.Errorf(L("failed to generate systemd file %s: %s"), path, err)
 	}
 	return nil
 }

mgrpxy/shared/templates/pod.go

@@ -30,6 +30,7 @@ ExecStartPre=/bin/rm -f %t/uyuni-proxy-pod.pid %t/uyuni-proxy-pod.pod-id
 
 ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/uyuni-proxy-pod.pid \
 		--pod-id-file %t/uyuni-proxy-pod.pod-id --name uyuni-proxy-pod \
+		--network {{ .Network }} \
         {{- range .Ports }}
         -p {{ .Exposed }}:{{ .Port }}{{ if .Protocol }}/{{ .Protocol }}{{ end }} \
         {{- end }}
@@ -52,6 +53,7 @@ type PodTemplateData struct {
 	Ports         []types.PortMap
 	HttpProxyFile string
 	Args          string
+	Network       string
 }
 
 // Render will create the systemd configuration file.

uyuni-tools.changes.oholecek.setup_proxy_pod_correct_net

@@ -0,0 +1 @@
+- Attach proxy pod to our podman network