Hello community,
here is the log from the commit of package drbd-formula for openSUSE:Leap:15.2
checked in at 2020-05-28 22:00:49
Comparing /work/SRC/openSUSE:Leap:15.2/drbd-formula (Old)
and /work/SRC/openSUSE:Leap:15.2/.drbd-formula.new.3606 (New)
Package is "drbd-formula"
Thu May 28 22:00:49 2020 rev:2 rq:809884 version:0.3.10
Changes:
--- /work/SRC/openSUSE:Leap:15.2/drbd-formula/drbd-formula.changes
2020-01-15 14:53:03.581510797 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.drbd-formula.new.3606/drbd-formula.changes
2020-05-28 22:00:50.363281791 +0200
@@ -1,0 +2,20 @@
+Mon Dec 23 07:58:27 UTC 2019 - nick wang
+
+- Version 0.3.10
+ * With the fix of salt-shaptools 0.2.9, doesn't need to
+ estimate a long time for write I/O completion.
+
+---
+Wed Dec 18 10:39:28 UTC 2019 - nick wang
+
+- Version 0.3.9
+ * Make file system after initial resync finished
+ * Sleep longer in case sync source change state late
+
+---
+Thu Nov 28 10:01:29 UTC 2019 - Xabier Arbulu
+
+- Version 0.3.8
+ * Add json rendering to jinja templates for old salt versions
+
+---
Old:
drbd-formula-0.3.7.tar.gz
New:
drbd-formula-0.3.10.tar.gz
Other differences:
--
++ drbd-formula.spec ++
--- /var/tmp/diff_new_pack.tvxVR5/_old 2020-05-28 22:00:50.811283152 +0200
+++ /var/tmp/diff_new_pack.tvxVR5/_new 2020-05-28 22:00:50.815283164 +0200
@@ -19,14 +19,14 @@
# See also https://en.opensuse.org/openSUSE:Specfile_guidelines
Name: drbd-formula
-Version:0.3.7
+Version:0.3.10
Release:0
Summary:DRBD deployment salt formula
License:Apache-2.0
URL:https://github.com/SUSE/%{name}
Source0:%{name}-%{version}.tar.gz
Requires: drbd-utils
-Requires: salt-shaptools
+Requires: salt-shaptools >= 0.2.9
Requires: salt-formulas-configuration
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ drbd-formula-0.3.7.tar.gz -> drbd-formula-0.3.10.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.3.7/README.md
new/drbd-formula-0.3.10/README.md
--- old/drbd-formula-0.3.7/README.md2019-11-14 10:13:12.998991325 +0100
+++ new/drbd-formula-0.3.10/README.md 2019-12-23 10:04:52.691682819 +0100
@@ -4,7 +4,7 @@
[](https://travis-ci.org/SUSE/drbd-formula)
# Version
-0.3.3
+0.3.9
# DRBD bootstrap salt formula
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/defaults.yaml
new/drbd-formula-0.3.10/drbd/defaults.yaml
--- old/drbd-formula-0.3.7/drbd/defaults.yaml 2019-11-14 10:13:12.998991325
+0100
+++ new/drbd-formula-0.3.10/drbd/defaults.yaml 2019-12-23 10:04:52.691682819
+0100
@@ -6,7 +6,7 @@
res_template: "res_single_vol_v9.j2"
need_init_sync: true
sync_interval: 10
- sync_timeout: 500
+ sync_timeout: 2000
need_format: true
stop_after_init_sync: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/global_confs.sls
new/drbd-formula-0.3.10/drbd/global_confs.sls
--- old/drbd-formula-0.3.7/drbd/global_confs.sls2019-11-14
10:13:12.998991325 +0100
+++ new/drbd-formula-0.3.10/drbd/global_confs.sls 2019-12-23
10:04:52.691682819 +0100
@@ -8,7 +8,7 @@
- mode: 644
- template: jinja
- defaults:
-resource: {{ drbd.resource }}
+resource: {{ drbd.resource|json }}
/etc/drbd.d/global_common.conf:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/drbd-formula-0.3.7/drbd/initial_sync.sls
new/drbd-formula-0.3.10/drbd/initial_sync.sls
--- old/drbd-formula-0.3.7/drbd/initial_sync.sls2019-11-14
10:13:13.002993325 +0100
+++ new/drbd-formula-0.3.10/drbd/initial_sync.sls 2019-12-23
10:04:52.691682819 +0100
@@ -2,6 +2,20 @@
{% set host = grains['host'] %}
{% for res in drbd.resource %}
+{% if drbd.need_format is defined and drbd.need_format is sameas true%}
+{% if res.file_system == 'xfs' %}
+init_drbd_install_xfs:
+ pkg.installed:
+- pkgs:
+ - xfsprogs
+- retry:
+attempts: 3
+interval: 15
+{% endif %}
+{% endif %}
+{% endfor %}
+
+{% for res in drbd.resource %}
init-stop-{{ res.name }}-if-run:
drbd.stopped:
- name: {{ res.name }}
@@ -20,42 +34,27 @@
- init-create-metadata-{{ res.name }}
{% endfor %}
