commit drbd-formula for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package drbd-formula for openSUSE:Factory checked in at 2021-02-26 22:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-formula (Old) and /work/SRC/openSUSE:Factory/.drbd-formula.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "drbd-formula" Fri Feb 26 22:00:05 2021 rev:9 rq:875297 version:0.4.1+git.1614327740.f74a33a Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-formula/drbd-formula.changes 2021-01-20 18:27:37.503528766 +0100 +++ /work/SRC/openSUSE:Factory/.drbd-formula.new.2378/drbd-formula.changes 2021-02-26 22:00:06.163855140 +0100 @@ -1,0 +2,7 @@ +Wed Feb 24 08:30:45 UTC 2021 - nick wang <nwang@suse.com> + +- Version bump 0.4.1 + * Support different backing device per node + (bsc#1179529) + +------------------------------------------------------------------- Old: ---- drbd-formula-0.4.0+git.1611073587.55c0dfd.tar.gz New: ---- drbd-formula-0.4.1+git.1614327740.f74a33a.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-formula.spec ++++++ --- /var/tmp/diff_new_pack.9dEEgJ/_old 2021-02-26 22:00:06.795855695 +0100 +++ /var/tmp/diff_new_pack.9dEEgJ/_new 2021-02-26 22:00:06.795855695 +0100 @@ -19,7 +19,7 @@ # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: drbd-formula -Version: 0.4.0+git.1611073587.55c0dfd +Version: 0.4.1+git.1614327740.f74a33a Release: 0 Summary: DRBD deployment salt formula License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9dEEgJ/_old 2021-02-26 22:00:06.823855720 +0100 +++ /var/tmp/diff_new_pack.9dEEgJ/_new 2021-02-26 22:00:06.823855720 +0100 @@ -4,8 +4,8 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">drbd-formula</param> - <param name="versionformat">0.4.0+git.%ct.%h</param> - <param name="revision">55c0dfd400f7aab50914a0a20fd61c37d99088d0</param> + <param name="versionformat">0.4.1+git.%ct.%h</param> + <param name="revision">f74a33a0a13f4b6c2b16889bef306619b9110053</param> </service> <service name="recompress" mode="disabled"> ++++++ drbd-formula-0.4.0+git.1611073587.55c0dfd.tar.gz -> drbd-formula-0.4.1+git.1614327740.f74a33a.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/.github/workflows/drbd-formula-ci.yml new/drbd-formula-0.4.1+git.1614327740.f74a33a/.github/workflows/drbd-formula-ci.yml --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/.github/workflows/drbd-formula-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/.github/workflows/drbd-formula-ci.yml 2021-02-26 09:22:20.000000000 +0100 @@ -0,0 +1,60 @@ +name: Formula CI +# this workflow will +# - deliver the package content to the configured repository +# - submit the new package content to the upstream repository +on: [push, pull_request] +env: + PACKAGE_NAME: drbd-formula +jobs: + + delivery: + runs-on: ubuntu-18.04 + if: ${{ github.event_name != 'pull_request' }} + container: + image: shap/continuous_deliver + env: + OBS_USER: ${{ secrets.OBS_USER }} + OBS_PASS: ${{ secrets.OBS_PASS }} + OBS_PROJECT: ${{ secrets.OBS_PROJECT }} + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: configure OSC + # OSC credentials must be configured beforehand as the HOME variables cannot be changed from /github/home + # that is used to run osc commands + run: | + /scripts/init_osc_creds.sh + mkdir -p $HOME/.config/osc + cp /root/.config/osc/oscrc $HOME/.config/osc + - name: deliver package + run: | + sed -i 's~%%VERSION%%~${{ github.sha }}~' _service && \ + sed -i 's~%%REPOSITORY%%~${{ github.repository }}~' _service && \ + /scripts/upload.sh + + submit: + needs: delivery + runs-on: ubuntu-18.04 + if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }} + container: + image: shap/continuous_deliver + env: + OBS_USER: ${{ secrets.OBS_USER }} + OBS_PASS: ${{ secrets.OBS_PASS }} + OBS_PROJECT: ${{ secrets.OBS_PROJECT}} + TARGET_PROJECT: ${{ secrets.TARGET_PROJECT}} + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: configure OSC + run: | + /scripts/init_osc_creds.sh + mkdir -p $HOME/.config/osc + cp /root/.config/osc/oscrc $HOME/.config/osc + - name: submit package + run: | + sed -i 's~%%VERSION%%~${{ github.sha }}~' _service && \ + sed -i 's~%%REPOSITORY%%~${{ github.repository }}~' _service && \ + /scripts/submit.sh \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/.travis.yml new/drbd-formula-0.4.1+git.1614327740.f74a33a/.travis.yml --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/.travis.yml 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -sudo: required -services: - - docker - -stages: - - delivery - - submit - -jobs: - include: - - stage: delivery - if: type != pull_request - env: - - FOLDER=/package - - PACKAGE_NAME=drbd-formula - - before_install: - - docker pull shap/continuous_deliver:latest - - script: - - | - docker run -t -v "$(pwd):/package" -w /package \ - -e OBS_USER -e OBS_PASS -e FOLDER -e OBS_PROJECT -e PACKAGE_NAME \ - shap/continuous_deliver \ - /bin/bash -c "sed -i 's~%%VERSION%%~$TRAVIS_COMMIT~' _service && \ - sed -i 's~%%REPOSITORY%%~$TRAVIS_REPO_SLUG~' _service && \ - /scripts/upload.sh" - - - stage: submit - if: type != pull_request AND branch = master - env: - - PACKAGE_NAME=drbd-formula - - before_install: - - docker pull shap/continuous_deliver:latest - - script: - - | - docker run -t -v "$(pwd):/package" -w /package \ - -e OBS_USER -e OBS_PASS -e OBS_PROJECT -e PACKAGE_NAME -e TARGET_PROJECT shap/continuous_deliver \ - /scripts/submit.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/README.md new/drbd-formula-0.4.1+git.1614327740.f74a33a/README.md --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/README.md 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/README.md 2021-02-26 09:22:20.000000000 +0100 @@ -1,10 +1,10 @@ -drbd-formula -=========== + -[](https://travis-ci.org/SUSE/drbd-formula) +# drbd-formula # Version -0.3.9 + +0.4.1 # DRBD bootstrap salt formula @@ -30,7 +30,7 @@ ``` 2. Work with [HABOOTSTRAP formula](https://github.com/SUSE/habootstrap-formula) or [NFS formula](https://github.com/saltstack-formulas/nfs-formula), could deploy NFS on top of DRBD with/without Pacemaker -> [NFS formula is packaged](https://build.opensuse.org/package/show/network:ha-clustering:Unstable/nfs-f...) in openSUSE build service + > [NFS formula is packaged](https://build.opensuse.org/package/show/network:ha-clustering:Unstable/nfs-f...) in openSUSE build service ## Install (Suse distros) @@ -44,74 +44,59 @@ sudo zypper in drbd-formula ``` - -Available states -================ +# Available states .. contents:: - :local: +:local: -``DRBD`` ---------------- +## `DRBD` A full set for load kernel module, write configuration files, initialize resources. -``drbd.drbd_kmod`` ---------------- +## `drbd.drbd_kmod` Load the DRBD kernel module. -``drbd.global_confs`` ---------------- +## `drbd.global_confs` Configure DRBD global configuration file `/etc/drbd.d/global_common.conf` and `/etc/drbd.conf`. -``drbd.res`` ---------------- +## `drbd.res` Configure the DRBD resource configuration files in `/etc/drbd.d/*.res`. -``drbd.create`` ---------------- +## `drbd.create` Create the metadata of all resources, do nothing if existed. -``drbd.createmd_force`` ---------------- +## `drbd.createmd_force` Call the DRBD salt module directly to `force` create metadata of all resources. -``drbd.initial_sync`` ---------------- +## `drbd.initial_sync` Create the metadata of all resources and run an initialize sync. -``drbd.start`` ---------------- +## `drbd.start` Start all DRBD resources. -``drbd.stop`` ---------------- +## `drbd.stop` Stop all DRBD resources. -``drbd.promote`` ---------------- +## `drbd.promote` Premote all DRBD resources. -``drbd.demote`` ---------------- +## `drbd.demote` Demote all DRBD resources. -``drbd.wait_sync`` ---------------- +## `drbd.wait_sync` Waiting all DRBD resources finish syncing. -``drbd.nfs_ready`` ---------------- +## `drbd.nfs_ready` Format the backing device and get mounted. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/_service new/drbd-formula-0.4.1+git.1614327740.f74a33a/_service --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/_service 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/_service 2021-02-26 09:22:20.000000000 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">drbd-formula</param> - <param name="versionformat">0.4.0+git.%ct.%h</param> + <param name="versionformat">0.4.1+git.%ct.%h</param> <param name="revision">%%VERSION%%</param> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/drbd/res.sls new/drbd-formula-0.4.1+git.1614327740.f74a33a/drbd/res.sls --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/drbd/res.sls 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/drbd/res.sls 2021-02-26 09:22:20.000000000 +0100 @@ -12,7 +12,9 @@ - defaults: name: '{{ res.name }}' device: '{{ res.device }}' +{% if res.disk is defined %} disk: '{{ res.disk }}' +{% endif %} meta_disk: '{{ res.meta_disk|default("internal") }}' protocol: '{{ res.protocol|default("C") }}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/drbd/templates/res_single_vol_v9.j2 new/drbd-formula-0.4.1+git.1614327740.f74a33a/drbd/templates/res_single_vol_v9.j2 --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/drbd/templates/res_single_vol_v9.j2 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/drbd/templates/res_single_vol_v9.j2 2021-02-26 09:22:20.000000000 +0100 @@ -1,7 +1,9 @@ resource {{ name }} { device {{ device }}; - disk {{ disk }}; meta-disk {{ meta_disk }}; +{%- if disk is defined %} + disk {{ disk }}; +{%- endif %} net { protocol {{ protocol }}; ping-timeout {{ ping_timeout }}; @@ -27,6 +29,9 @@ {% for node in nodes -%} {{ " on " ~ node.name }} { address {{ node.ip ~ ":" ~ node.port }}; +{%- if node.disk is defined %} + disk {{ node.disk }}; +{%- endif %} node-id {{ node.id }}; } {% endfor -%} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/drbd-formula.changes new/drbd-formula-0.4.1+git.1614327740.f74a33a/drbd-formula.changes --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/drbd-formula.changes 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/drbd-formula.changes 2021-02-26 09:22:20.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 24 08:30:45 UTC 2021 - nick wang <nwang@suse.com> + +- Version bump 0.4.1 + * Support different backing device per node + (bsc#1179529) + +------------------------------------------------------------------- Tue Jan 19 13:44:20 UTC 2021 - Xabier Arbulu <xarbulu@suse.com> - Version bump 0.4.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.0+git.1611073587.55c0dfd/pillar.example new/drbd-formula-0.4.1+git.1614327740.f74a33a/pillar.example --- old/drbd-formula-0.4.0+git.1611073587.55c0dfd/pillar.example 2021-01-19 17:26:27.000000000 +0100 +++ new/drbd-formula-0.4.1+git.1614327740.f74a33a/pillar.example 2021-02-26 09:22:20.000000000 +0100 @@ -82,6 +82,7 @@ # # Define the device name and minor number of a replicated block device. # device: "/dev/drbd8" # # Define the lower-level block device that DRBD will use for storing the actual data. + # # Also support configure disk in nodes section for different device per node. # disk: "/dev/vdb1" # # Optional: Define where the metadata of a replicated block device resides. # meta_disk: "internal" @@ -112,6 +113,7 @@ # nodes: # # Node name # - name: "drbd-node1" + # # disk is optional if config in resource section # # Node IP address # ip: "192.168.10.101" # # Node port @@ -120,6 +122,7 @@ # id: 1 # # Node name # - name: "drbd-node2" + # # disk is optional if config in resource section # # Node IP address # ip: "192.168.10.102" # # Node port
participants (1)
-
Source-Sync