Solve conflict

yast · Mar 23, 2023 · 6b68d26 · 6b68d26
2 parents 2c8775a + a4c0732
commit 6b68d26
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/package/yast2-cluster.changes b/package/yast2-cluster.changes
@@ -1,5 +1,15 @@
 -------------------------------------------------------------------
-Fri Nov  4 15:20:47 UTC 2022 - XinLiang <XLiang@suse.com>
+Thu Mar 23 07:55:52 UTC 2023 - Peter Varkoly <varkoly@suse.com>
+
+- bsc#1209602 bugs in yast2-cluster Write funcion
+- Remove sensless call to sysconfig.openais
+- Remove sensless sysconfig.openais agent
+- Enable csync2.socket
+- Add SCR.Write(PATH,nil) to save the configuration inmediately
+- Version 4.5.2
+
+-------------------------------------------------------------------
+Fri Nov  4 14:59:10 UTC 2022 - XinLiang <XLiang@suse.com>
 
 - bsc#1204530, set crypto_hash as "sha1" and set crypto_cipher as "aes256",
 - set transport as "udpu" by default,

diff --git a/package/yast2-cluster.spec b/package/yast2-cluster.spec
@@ -18,7 +18,7 @@
 %define _fwdefdir %{_prefix}/lib/firewalld/services
 
 Name:           yast2-cluster
-Version:        4.5.1
+Version:        4.5.2
 Release:        0
 Summary:        Configuration of cluster
 License:        GPL-2.0-only

diff --git a/src/modules/Cluster.rb b/src/modules/Cluster.rb
@@ -531,13 +531,10 @@ def save_csync2_conf
       SCR.Write(path(".csync2_ha.value.ha_group.host"), @csync2_host)
       SCR.Write(path(".csync2_ha.value.ha_group.include"), @csync2_include)
       SCR.Write(path(".csync2_ha.value.ha_group.key"), [@csync2_key_file])
+      SCR.Write(path(".csync2_ha"), nil)
 
       SCR.Write(path(".sysconfig.pacemaker.LRMD_MAX_CHILDREN"), 4)
-      SCR.Write(
-        path(".sysconfig.openais.COROSYNC_DEFAULT_CONFIG_IFACE"),
-        "openaisserviceenableexperimental:corosync_parser"
-      )
-
+      SCR.Write(path(".sysconfig.pacemaker"), nil)
       nil
     end
 
@@ -747,7 +744,7 @@ def Write
         SCR.Execute(path(".target.bash_output"), "systemctl enable corosync.service")
       end
       if @global_startcsync2 == true
-        SCR.Execute(path(".target.bash_output"), "systemctl enable csync2")
+        SCR.Execute(path(".target.bash_output"), "systemctl enable csync2.socket")
       end
 
       return false if Abort()

diff --git a/src/scrconf/cfg_openais.scr b/src/scrconf/cfg_openais.scr