#56 vpn - no filter named vpn_ipaddr; kdump - kdump.service fails; remove collection
Merged 2 years ago by rmeggins. Opened 2 years ago by rmeggins.
rpms/ rmeggins/linux-system-roles vpn-kdump  into  rawhide

file modified
+3
@@ -217,3 +217,6 @@ 

  /crypto_policies-1.2.3.tar.gz

  /ssh-1.1.4.tar.gz

  /cockpit-1.2.1.tar.gz

+ /kdump-1.2.2.tar.gz

+ /vpn-1.3.1.tar.gz

+ /auto-maintenance-32ab2252be64d5e71454b83dc2c701d22168bef4.tar.gz

file modified
+20 -4
@@ -30,7 +30,7 @@ 

  %endif

  Url: https://github.com/linux-system-roles

  Summary: Set of interfaces for unified system management

- Version: 1.13.0

+ Version: 1.13.1

  Release: 1%{?dist}

  

  #Group: Development/Libraries
@@ -139,7 +139,7 @@ 

  

  #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1

  %global rolename4 kdump

- %deftag 4 1.2.1

+ %deftag 4 1.2.2

  

  %defcommit 5 2b881a6c3fac68457711be598523f625ded16565

  %global rolename5 network
@@ -197,7 +197,7 @@ 

  

  #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3

  %global rolename18 vpn

- %deftag 18 1.3.0

+ %deftag 18 1.3.1

  

  %global rolename19 firewall

  %deftag 19 1.0.3
@@ -205,7 +205,7 @@ 

  %global rolename20 cockpit

  %deftag 20 1.2.1

  

- %global mainid 792c7c0a5633b0a41edf7b1cb4d97963a585e508

+ %global mainid 32ab2252be64d5e71454b83dc2c701d22168bef4

  Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz

  Source1: %{archiveurl1}

  Source2: %{archiveurl2}
@@ -450,6 +450,9 @@ 

                        "https://access.redhat.com/articles/3050101" \

                        "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=rhel-system-roles" \

                        > galaxy.yml.tmp

+ # we vendor-in all of the dependencies on rhel, so remove them

+ rm lsr_role2collection/collection_requirements.txt

+ # but leave bindep.txt for now

  %else

  ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \

                        "Linux System Roles Ansible Collection" \
@@ -460,6 +463,10 @@ 

  includes=""

  for role in %{rolenames}; do

      includes="$includes --include $role"

+ %if 0%{?rhel}

+     # we vendor-in all of the dependencies on rhel, so remove them

+     rm -f "$role/meta/requirements.yml"

+ %endif

  done

  

  LANG=en_US.utf-8 LC_ALL=en_US.utf-8 python3 release_collection.py --galaxy-yml galaxy.yml \
@@ -714,6 +721,15 @@ 

  %endif

  

  %changelog

+ * Tue Feb 8 2022 Rich Megginson <rmeggins@redhat.com> - 1.13.1-1

+ - vpn - template error while templating string: no filter named 'vpn_ipaddr'

+   Resolves rhbz#2052103 (EL8)

+   Resolves rhbz#2050341 (EL9)

+ - kdump - Unable to start service kdump: Job for kdump.service failed because the control process exited with error code.

+   Resolves rhbz#2052105 (EL8)

+   Resolves rhbz#2050419 (EL9)

+ - remove collection dependencies on rhel because we vendor them in

+ 

  * Tue Feb 1 2022 Rich Megginson <rmeggins@redhat.com> - 1.13.0-1

  - storage - RFE: Add support for RAID volumes (lvm-only)

    Resolves rhbz#2016514 (EL8)

file modified
+3 -3
@@ -1,11 +1,11 @@ 

  SHA512 (ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz) = f9745acde93b8d6d5bf0a19971fe786423efeb7744efe26692ebf215b2450ed2e204f08243831043c771cb60a47aff19e4c98787bfa1d474fe31105034097c9a

- SHA512 (auto-maintenance-792c7c0a5633b0a41edf7b1cb4d97963a585e508.tar.gz) = 37c309df298e01c75d5c4d435e46b18388f358f67ec8a1ae7e69eb7c7059677f515ccc0af6a2e267257ec1a6e310826eef628604eadfe85be52e5bb51bfbfdf3

+ SHA512 (auto-maintenance-32ab2252be64d5e71454b83dc2c701d22168bef4.tar.gz) = ab300bed5293907ff6a5cb5b3ac495afaa1f67849f08028e3b7149a518e9209e21f15f249fb5e2bd5873598e4e5d7e2b483105974fa2266fd4198173f2e3dee3

  SHA512 (certificate-1.1.2.tar.gz) = 52fae2846b5d77af0be11e34476c557be6f88a85efd052617260e919fe64f33e5b513cdd278e6c1bb10c8c50ac9899f47661801046db0c49b06acbb7714fa7d7

  SHA512 (cockpit-1.2.1.tar.gz) = 171e736694598564e15fbac4c42c78fc44b6fc801f4b0bcacadd6781690d1816b09a55658c440d83d19b7551e3f6ceb79deb49af7ff86f757b97a173d58a0cad

  SHA512 (crypto_policies-1.2.3.tar.gz) = 643e6d263cce76d394223ddafb48815db144d812ae141757452347fc600186c9414bd03beb97aa9a2cf3dc2c5f6f4ef381126332c2bbca2cc04a1bd1b00ee762

  SHA512 (firewall-1.0.3.tar.gz) = 5ba7f799683fd704b4f4c7b556fbdd985cdef045d345fef209568c279489fab1f102fb28797f484795840f9a428659a56ae99d2b5bd64f12c803b45f221986c0

  SHA512 (ha_cluster-1.4.0.tar.gz) = 62b9d4b2bd3ea4f2765fb16f3a8a9b8d78099ad2b65d5562c167d79829596d54fe0aad518812d059c125a596bdf3eec72c7134e15904aeb09446365613bbcf9e

- SHA512 (kdump-1.2.1.tar.gz) = 34456130dcf930af29e866821a321e77cf7694cad78432b61de579fd81109014b4bf36bec5cad26a73883c45955b433ee80679ac85b1a0e70e8b24db6663d81e

+ SHA512 (kdump-1.2.2.tar.gz) = 3410869012bb7b41cd772bc6bf8ff55537407251f038de663d8778431740e739562138b426d73e037883997e68ac0f46d072aa8415b86e56dc7a654cf7f54423

  SHA512 (kernel_settings-1.1.4.tar.gz) = a21fbb74852fd255fd8372b0f646b452c1812f488c0082864ebde2506193b4d75b4d89082f85a215fdc6953ededa3a07129134a186fdde89730db5eb52d372bd

  SHA512 (logging-1.8.1.tar.gz) = 82f3ed3283590f97e9f8e96ead02924880fce650b54508549fa5c7fd40c6eb10763d0735c4133f39fa3fae5767fa2c1838d635f7835d45d014857a84a74b53af

  SHA512 (metrics-1.4.1.tar.gz) = e5f42f13904e702fadb0a239cdd03aa4eacd1e4766bfae3df05bddb72d308a2f12a5dae0f1a936c013e367624d3b3ad6952193de0e451983ca94eb2cb84f0418
@@ -18,4 +18,4 @@ 

  SHA512 (storage-1.7.0.tar.gz) = 5d8a91e53838f704effd46f4ddaf6bc4c1b0b9bb472698314d478ffd39e298deeb81f1743f904c15676dbb08dbba34fa77d5b76f9acccdb55e514e9b28c67359

  SHA512 (timesync-1.6.5.tar.gz) = 0c32d00bed298855a4beaa90a922a7e7d9fc071678a0a0059138a4a0a5b18f92f631f6605e0a1bbcbcd8e76c71688b7a085b4b7dc59d84f38d376a1152400aba

  SHA512 (tlog-1.2.3.tar.gz) = 54185b0e92d30539c2c22e17fd3103c0f5d5a6d223f31e61b2681cffba1e2f1387ea6d1766a04ce88385e0c5113dbba10365bf1517d12df5c919d2bddb62b8fc

- SHA512 (vpn-1.3.0.tar.gz) = 59ba3f71ef0d6f3b5f01c96cf58379287632666279d01b7e291061a17588f74b83a4cd84f6a9bb4df57948465b056fa53b12ef2b5482480e19e25885541754d6

+ SHA512 (vpn-1.3.1.tar.gz) = 46826c4a2a2cfaae470cb5f1ad46f93ed1cb5eef156d8ec454320922c28a24d4902557be61dfcbc929c8740d37023d2f56aa474ff67fc8a16ee8921e1aea2956

vpn - template error while templating string: no filter named 'vpn_ipaddr'
Resolves: rhbz#2052103 (EL8)
Resolves: rhbz#2050341 (EL9)

kdump - Unable to start service kdump: Job for kdump.service failed because the
control process exited with error code.
Resolves: rhbz#2052105 (EL8)
Resolves: rhbz#2050419 (EL9)

remove collection dependencies on rhel because we vendor them in

2 new commits added

  • vpn - no filter named vpn_ipaddr; kdump - kdump.service fails; remove collection dependencies
  • vpn - no filter named vpn_ipaddr; kdump - kdump.service fails; remove collection dependencies
2 years ago

+1
We should also remove https://github.com/linux-system-roles/auto-maintenance/blob/master/lsr_role2collection/collection_requirements.txt from auto-maintenance?

Yes, I suppose we should - we have no dependencies on jmespath or netaddr anymore

Pull-Request has been merged by rmeggins

2 years ago