Hello community, here is the log from the commit of package drbd-formula for openSUSE:Factory checked in at 2019-11-15 22:38:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-formula (Old) and /work/SRC/openSUSE:Factory/.drbd-formula.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-formula" Fri Nov 15 22:38:43 2019 rev:3 rq:748871 version:0.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-formula/drbd-formula.changes 2019-11-13 13:29:19.987760779 +0100 +++ /work/SRC/openSUSE:Factory/.drbd-formula.new.26869/drbd-formula.changes 2019-11-15 22:38:50.328239556 +0100 @@ -1,0 +2,6 @@ +Wed Nov 13 11:59:38 UTC 2019 - Xabier Arbulu <[email protected]> + +- Version 0.3.7 + * Retry the packages installation to make the code more robust + +------------------------------------------------------------------- Old: ---- drbd-formula-0.3.6.tar.gz New: ---- drbd-formula-0.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-formula.spec ++++++ --- /var/tmp/diff_new_pack.2YWe4Z/_old 2019-11-15 22:38:52.180245559 +0100 +++ /var/tmp/diff_new_pack.2YWe4Z/_new 2019-11-15 22:38:52.184245572 +0100 @@ -19,7 +19,7 @@ # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: drbd-formula -Version: 0.3.6 +Version: 0.3.7 Release: 0 Summary: DRBD deployment salt formula License: Apache-2.0 ++++++ drbd-formula-0.3.6.tar.gz -> drbd-formula-0.3.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/drbd/nfs_ready.sls new/drbd-formula-0.3.7/drbd/nfs_ready.sls --- old/drbd-formula-0.3.6/drbd/nfs_ready.sls 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/drbd/nfs_ready.sls 2019-11-14 10:13:13.002993325 +0100 @@ -2,7 +2,6 @@ {% set host = grains['host'] %} include: - - drbd.additional_repos - drbd.mkfs {% if drbd.with_ha is sameas false %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/drbd/packages.sls new/drbd-formula-0.3.7/drbd/packages.sls --- old/drbd-formula-0.3.6/drbd/packages.sls 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/drbd/packages.sls 2019-11-14 10:13:13.002993325 +0100 @@ -12,6 +12,9 @@ - fromrepo: {{ repo }} - pkgs: - patterns-ha-ha_sles + - retry: + attempts: 3 + interval: 15 {% else %} @@ -22,6 +25,9 @@ - drbd - drbd-utils - yast2-drbd + - retry: + attempts: 3 + interval: 15 {% if drbd.with_ha is sameas true %} install_cluster_packages_for_drbd: @@ -32,6 +38,9 @@ - hawk2 - pacemaker - corosync + - retry: + attempts: 3 + interval: 15 {% else %} @@ -39,6 +48,9 @@ pkg.installed: - pkgs: - nfs-formula + - retry: + attempts: 3 + interval: 15 {% endif %} {% endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/drbd-formula.changes new/drbd-formula-0.3.7/drbd-formula.changes --- old/drbd-formula-0.3.6/drbd-formula.changes 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/drbd-formula.changes 2019-11-14 10:13:13.002993325 +0100 @@ -1,8 +1,14 @@ ------------------------------------------------------------------- +Wed Nov 13 11:59:38 UTC 2019 - Xabier Arbulu <[email protected]> + +- Version 0.3.7 + * Retry the packages installation to make the code more robust + +------------------------------------------------------------------- Wed Nov 13 09:31:49 UTC 2019 - Xabier Arbulu <[email protected]> - Version 0.3.6 - * Remove additional_repos salt state + * Remove additional_repos salt state ------------------------------------------------------------------- Mon Nov 11 14:40:12 UTC 2019 - Xabier Arbulu <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/drbd-formula.spec new/drbd-formula-0.3.7/drbd-formula.spec --- old/drbd-formula-0.3.6/drbd-formula.spec 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/drbd-formula.spec 2019-11-14 10:13:13.002993325 +0100 @@ -19,7 +19,7 @@ # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: drbd-formula -Version: 0.3.6 +Version: 0.3.7 Release: 0 Summary: DRBD deployment salt formula License: Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/examples/README.md new/drbd-formula-0.3.7/examples/README.md --- old/drbd-formula-0.3.6/examples/README.md 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/examples/README.md 2019-11-14 10:13:13.002993325 +0100 @@ -20,4 +20,4 @@ * [Pillar: DRBD formula](./pillar.example.drbd) -* [Pillar: NFS formula](./with_pacemakerout/pillar.example.nfs) +* [Pillar: NFS formula](./without_pacemakerout/pillar.example.nfs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/examples/pillar.example.drbd new/drbd-formula-0.3.7/examples/pillar.example.drbd --- old/drbd-formula-0.3.6/examples/pillar.example.drbd 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/examples/pillar.example.drbd 2019-11-14 10:13:13.002993325 +0100 @@ -3,32 +3,32 @@ drbd: ## Install required package to manage DRBD - install_packages: false + #install_packages: false ## Configure DRBD in pacemaker cluster - #with_ha: true + #with_ha: false + + ## Pirmary node when promoting DRBD + ## TODO: Only support single primary currently + promotion: "drbd-node1" + + ## Resource template for /etc/drbd.d/xxx.res + #res_template: "res_single_vol_v9.j2" ## Perform initial sync for DRBD resources #need_init_sync: true - ## Optional: stop the DRBD resources after initial resync - #stop_after_init_sync: true + ## Optional: interval check time for waiting for resource synced + #sync_interval: 10 + + ## Optional: timeout for waiting for resource synced + #sync_timeout: 500 ## Optional: format the DRBD resource after initial resync #need_format: true - - # Salt deployment/manage related parameters - salt: - # Pirmary node when promoting DRBD - # TODO: Only support single primary currently - promotion: "drbd-node1" - # # Resource template for /etc/drbd.d/xxx.res - # res_template: "res_single_vol_v9.j2" - # # Optional: interval check time for waiting for resource synced - # sync_interval: 10 - # # Optional: timeout for waiting for resource synced - # sync_timeout: 500 + ## Optional: stop the DRBD resources after initial resync + #stop_after_init_sync: true ## Configures some "global" parameters of /etc/drbd.d/global_common.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/examples/with_pacemaker/drbd_with_nfs_crm.j2 new/drbd-formula-0.3.7/examples/with_pacemaker/drbd_with_nfs_crm.j2 --- old/drbd-formula-0.3.6/examples/with_pacemaker/drbd_with_nfs_crm.j2 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/examples/with_pacemaker/drbd_with_nfs_crm.j2 2019-11-14 10:13:13.002993325 +0100 @@ -18,6 +18,7 @@ clone cl-nfsserver nfsserver \ meta interleave=true +# Need to edit drbd pillar file. {% for res in drbd.resource %} primitive drbd-{{ res.name }} ocf:linbit:drbd \ params drbd_resource={{ res.name }} \ @@ -26,7 +27,7 @@ ms ms_{{ res.name }} drbd-{{ res.name }} \ meta master-max=1 master-node-max=1 \ - meta clone-max=2 clone-node-max=1 \ + meta clone-max={{ res.nodes | length }} clone-node-max=1 \ meta notify=true target-role=Started primitive fs_{{ res.name }} ocf:heartbeat:Filesystem \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.3.6/examples/without_pacemaker/pillar.example.nfs new/drbd-formula-0.3.7/examples/without_pacemaker/pillar.example.nfs --- old/drbd-formula-0.3.6/examples/without_pacemaker/pillar.example.nfs 2019-11-13 10:55:44.664337122 +0100 +++ new/drbd-formula-0.3.7/examples/without_pacemaker/pillar.example.nfs 2019-11-14 10:13:13.002993325 +0100 @@ -25,4 +25,3 @@ mountpoint: "/mnt/local-A" location: "drbd-node1:/mnt/fs-A" persist: False -
