rmeggins pushed to linux-system-roles (f34). "Update changelog
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From 3aabdbaa936fc19ae6163d10d3ca23919e390b44 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: Update changelog
Related: rhbz#1943679
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index d5c97e3..d4d1454 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -584,6 +584,7 @@ fi
Resolves rhbz#1937938
- rebase remaining roles to latest upstream
Resolves rhbz#1937938
+- Generate %%files dynamically
* Tue Apr 13 2021 Noriko Hosoi <nhosoi(a)redhat.com> - 1.0.1-2
- Adding the -collection-artifact subpackage, enabled using
https://src.fedoraproject.org/rpms/linux-system-roles/c/3aabdbaa936fc19ae...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "update changelog
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From 39d4b36165cc936485771b7b6dcdb168e41c3688 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: update changelog
Related: rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index aad48be..5277fa5 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -791,6 +791,8 @@ popd
Resolves rhbz#1937938
- rebase sshd role to latest upstream
Resolves rhbz#1937938
+- rebase remaining roles to latest upstream
+ Resolves rhbz#1937938
* Tue Apr 13 2021 Noriko Hosoi <nhosoi(a)redhat.com> - 1.0.1-2
- Adding the -collection-artifact subpackage, enabled using
https://src.fedoraproject.org/rpms/linux-system-roles/c/39d4b36165cc93648...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "update sources (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From 14e2c1b486d6a1c22041daf3e91b10f7ea626cc3 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: update sources
Related: rhbz#1937938
---
diff --git a/.gitignore b/.gitignore
index 3d2d047..70c1879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,14 @@
/selinux-557546f922886fc1e73012f2af08ec80fec82fe2.tar.gz
/storage-2c3eeb8b2dd898d8c589a0740c2ba9b707e4ed2c.tar.gz
/ansible-sshd-428d390668077f0baf5e88c5834ee810ae11113c.tar.gz
+/auto-maintenance-34dd2e26c6a6694a43d3b471eac0048805106a18.tar.gz
+/certificate-23f1a414ab022a506614c5be8eadf1708dc45b2b.tar.gz
+/crypto_policies-ff335b87017954c0b47bfe818700e0f1600b04db.tar.gz
+/ha_cluster-d97f48a21002497e1ac1bd1385841f2939d7b840.tar.gz
+/kernel_settings-a8ab76f8076078763dacacf3384315c86b342d52.tar.gz
/metrics-c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579.tar.gz
/network-0f5a882bcab58baba527015b7cde01c7c52d2254.tar.gz
+/selinux-170eff9fd90e481242784b49688d1fe7203c1889.tar.gz
+/ssh-54bec0855966cc3eed65b26a7c90962eb103d66d.tar.gz
+/tlog-103d3996436c98dccf89e645378e76bd9add2abb.tar.gz
/postfix-bbf5784849d362cc3443fde8b09da26ea698a8ce.tar.gz
diff --git a/sources b/sources
index f5506f4..72e97be 100644
--- a/sources
+++ b/sources
@@ -5,14 +5,14 @@ SHA512 (network-0f5a882bcab58baba527015b7cde01c7c52d2254.tar.gz) = 6744d1d792612
SHA512 (selinux-557546f922886fc1e73012f2af08ec80fec82fe2.tar.gz) = aa6e1ca4e0a5ccba486d4cb554f7112a718afcb5c245b92464f047fff922efe53e2d39fdf39c784a51f54e950be1a49e9591e2f96227f42f97af3ed89cbacad9
SHA512 (storage-2c3eeb8b2dd898d8c589a0740c2ba9b707e4ed2c.tar.gz) = c9059087870970cdf184c2001f5b22f89ff07e97e3baa075d50e7aa8d1624af440a344bd772eaf8c484bab8064c295d76e8646a8c88944a06160399139d9ca03
SHA512 (metrics-c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579.tar.gz) = c9b6be06ff39fa030c65a36940c717c40a6e0d484f2a3bc76f5289ed72f034875f83fa0c08140a2e9aabb1bb9dd8abed0321a2e25ab01687bb314717e5b2f005
-SHA512 (tlog-1.1.0.tar.gz) = f9f36fb2bfc76687652424ecab70c1e11b435551cb373a483c1fde6c7c68013a95a1b313e1187ff5495b22fdf7b56f9e6c97f3015d8144f21bed6617916c07e9
-SHA512 (kernel_settings-4c81fd1380712ab0641b6837f092dd9caeeae0a6.tar.gz) = 87a2348de424abfb4f43b69878db250f02ab9eedbc2906cabe15e202934149f0890f88d632106c6af9e6461984d2ace3856f3718f21a3b5ba8ffb68c8e268fe8
+SHA512 (tlog-103d3996436c98dccf89e645378e76bd9add2abb.tar.gz) = 854be5ac14cb44868c20e5700bba716fe4f105139b00875d113ffd3bcf337a7c65668404a15adf54f8e2c0e37bd5ed28020be176bc9b708ccfacdf5ad4654dc6
+SHA512 (kernel_settings-a8ab76f8076078763dacacf3384315c86b342d52.tar.gz) = 74e48168448238fe120204db3dd3c6a7c47bd4e0f67175d9ed14fd02eed28a1c73de99f4a29f9bdf9046f30dc4ddb4d12f2d2f59ff21c99952064973152384b7
SHA512 (logging-07e08107e7ccba5822f8a7aaec1a2ff0a221bede.tar.gz) = 1921f9d8595d26e0f2dbc35976308b89c5b9f826763d04948c9a9533d07055d5ec26094b5c4492da248002f8de0200aaebd4920fa0d7ba000ec8b3513ed23ea6
SHA512 (nbde_client-19f06159582550c8463f7d8492669e26fbdf760b.tar.gz) = f84cdfabfee8cfb4b3dbb9a8fcf5a03d5f875ff54b2f267784adc0afdaa2c464dae1ae9c51263a9c07d5780abc91fe57625d84b9c1ce7b6d847e8b2bdaea3304
SHA512 (nbde_server-4dfc5e2aca74cb82f2a50eec7e975a2b78ad9678.tar.gz) = 021052bde28e1d7b8ab0f3780728211bf0e50e6f655e0f5fa36681c6c16f7393b357a924d92e374825f0b79cbc53fd1afedd7ec5517e9bd34e964e7679c59a7c
-SHA512 (certificate-0376ceece57882ade8ffaf431b7866aae3e7fed1.tar.gz) = 85b58b52f476bb7dc2a6dad78d7f0bb4243b19d6f48540f63ac20a7594e78108ea4dd38fa8018afe1284ef2e5f53dbc8403ffb2297fd3a8fcb29b9282389f41a
-SHA512 (crypto_policies-2e2941c5545571fc8bc494099bdf970f498b9d38.tar.gz) = 098c067abddbda34cfe5d2c53be6b4bbd0c265b0e9dc8d8edaf080f626304da69718e42d73841ead9f1b0efe61a47f1eae21512ea1b66d2aa7097612f92ffbb9
+SHA512 (certificate-23f1a414ab022a506614c5be8eadf1708dc45b2b.tar.gz) = d8c1fb1716e5ace484a58a754c14be2212b34bf88c72b430188694226f214f16e14d418fc5dc4926edee21aa363b1515083c02bbc4e23fd35c2ef23214f7d7ae
+SHA512 (crypto_policies-ff335b87017954c0b47bfe818700e0f1600b04db.tar.gz) = d4439d339278878f534466848e54ff6d2901e9c1a7924d5f3450c06439ec92c3fbaa838b6036da88c5654fd8f350edf18322b409c2d5acb09076fcfd444efbf6
SHA512 (ansible-sshd-428d390668077f0baf5e88c5834ee810ae11113c.tar.gz) = 55ce34bbade1e0fb75cc8443995233a32ac9474ba8411a94fd90d808ff9da1dc188ad5a790472ab301324c7147ba49f614bef59d0a254e43570a1462c0b5b8ec
SHA512 (auto-maintenance-e9e30b03c0fe9387cb0ea8a5e7aac8313de2deef.tar.gz) = b2f623e5982a823bfc11c7f619162ae2c4a03ae0a7ffcbdcb92cb81a5159825f6279c6cb6360ddb187d916280fd57556b1b46557fade1524926f099b532fc05d
-SHA512 (ssh-21adc637511db86b5ba279a70a7301ef3a170669.tar.gz) = 5f8ff88414405babc9895a0c8c6ea2a0d97e703fa4e57b26151f7dd4f2634db680cc70707fc3e7ffd85468ef6785cdcbf7c2963d259c54de379ebc7546a15ba1
-SHA512 (ha_cluster-779bb78559de58bb5a1f25a4b92039c373ef59a4.tar.gz) = cbaaf9f8d35942c7c8fe72f67374ef588c52ca8752450df0312b9a3c5fd4f9c47aef3c5a1f8d8849e499f9baba1fc3080e1359ed06424c99fc692065df652879
+SHA512 (ssh-54bec0855966cc3eed65b26a7c90962eb103d66d.tar.gz) = 19c0dcf2eea24a1ff8cbc8795f6f751e8b98927d274a47fca82b06586992140a0cfa892750e935ac159391d2863aee17ed58dec69fae134c842250dea9658f08
+SHA512 (ha_cluster-d97f48a21002497e1ac1bd1385841f2939d7b840.tar.gz) = c931ae0e51b32cb002453da6da2ebb37396c70253c40d51800c66fd0b109a4ae37649fbeaaa09533573a9856f582a3b0ff46373bd55c03ebdd7b219af95a0899
https://src.fedoraproject.org/rpms/linux-system-roles/c/14e2c1b486d6a1c22...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "update sources for sshd
rebase (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From a648802582fe270ca744e137cdf39b1003bef756 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: update sources for sshd rebase
Related: rhbz#1937938
---
diff --git a/.gitignore b/.gitignore
index 63239ea..3d2d047 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@
/timesync-8a95989e158519ce4bebe10091c47ef88b29261b.tar.gz
/selinux-557546f922886fc1e73012f2af08ec80fec82fe2.tar.gz
/storage-2c3eeb8b2dd898d8c589a0740c2ba9b707e4ed2c.tar.gz
+/ansible-sshd-428d390668077f0baf5e88c5834ee810ae11113c.tar.gz
/metrics-c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579.tar.gz
/network-0f5a882bcab58baba527015b7cde01c7c52d2254.tar.gz
/postfix-bbf5784849d362cc3443fde8b09da26ea698a8ce.tar.gz
diff --git a/sources b/sources
index 5a6d87c..f5506f4 100644
--- a/sources
+++ b/sources
@@ -12,7 +12,7 @@ SHA512 (nbde_client-19f06159582550c8463f7d8492669e26fbdf760b.tar.gz) = f84cdfabf
SHA512 (nbde_server-4dfc5e2aca74cb82f2a50eec7e975a2b78ad9678.tar.gz) = 021052bde28e1d7b8ab0f3780728211bf0e50e6f655e0f5fa36681c6c16f7393b357a924d92e374825f0b79cbc53fd1afedd7ec5517e9bd34e964e7679c59a7c
SHA512 (certificate-0376ceece57882ade8ffaf431b7866aae3e7fed1.tar.gz) = 85b58b52f476bb7dc2a6dad78d7f0bb4243b19d6f48540f63ac20a7594e78108ea4dd38fa8018afe1284ef2e5f53dbc8403ffb2297fd3a8fcb29b9282389f41a
SHA512 (crypto_policies-2e2941c5545571fc8bc494099bdf970f498b9d38.tar.gz) = 098c067abddbda34cfe5d2c53be6b4bbd0c265b0e9dc8d8edaf080f626304da69718e42d73841ead9f1b0efe61a47f1eae21512ea1b66d2aa7097612f92ffbb9
-SHA512 (ansible-sshd-e1de59b3c54e9d48a010eeca73755df339c7e628.tar.gz) = 089c5ac20f223bfdc9efaab77efb1e590c4ceb7a21c5ffc2218171942150fa0797c2d5ac38f38a81f4194dd8da9bba9a32df9db4d56255a99e0bd9675bffa355
+SHA512 (ansible-sshd-428d390668077f0baf5e88c5834ee810ae11113c.tar.gz) = 55ce34bbade1e0fb75cc8443995233a32ac9474ba8411a94fd90d808ff9da1dc188ad5a790472ab301324c7147ba49f614bef59d0a254e43570a1462c0b5b8ec
SHA512 (auto-maintenance-e9e30b03c0fe9387cb0ea8a5e7aac8313de2deef.tar.gz) = b2f623e5982a823bfc11c7f619162ae2c4a03ae0a7ffcbdcb92cb81a5159825f6279c6cb6360ddb187d916280fd57556b1b46557fade1524926f099b532fc05d
SHA512 (ssh-21adc637511db86b5ba279a70a7301ef3a170669.tar.gz) = 5f8ff88414405babc9895a0c8c6ea2a0d97e703fa4e57b26151f7dd4f2634db680cc70707fc3e7ffd85468ef6785cdcbf7c2963d259c54de379ebc7546a15ba1
SHA512 (ha_cluster-779bb78559de58bb5a1f25a4b92039c373ef59a4.tar.gz) = cbaaf9f8d35942c7c8fe72f67374ef588c52ca8752450df0312b9a3c5fd4f9c47aef3c5a1f8d8849e499f9baba1fc3080e1359ed06424c99fc692065df652879
https://src.fedoraproject.org/rpms/linux-system-roles/c/a648802582fe270ca...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "rebase remaining roles
to latest upstream (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From c467cf8b5c425a8139f8ec76efadc828bebbe3c2 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: rebase remaining roles to latest upstream
Resolves: rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 927ecda..aad48be 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -125,11 +125,11 @@ BuildRequires: ansible >= 2.9.10
%global rolename7 metrics
#%%deftag 7 0.1.0
-#%%defcommit 8 cfa70b6b5910b3198aba2679f8fc36aad45ca45a
+%defcommit 8 103d3996436c98dccf89e645378e76bd9add2abb
%global rolename8 tlog
-%deftag 8 1.1.0
+#%%deftag 8 1.1.0
-%defcommit 9 4c81fd1380712ab0641b6837f092dd9caeeae0a6
+%defcommit 9 a8ab76f8076078763dacacf3384315c86b342d52
%global rolename9 kernel_settings
#%%deftag 9 1.0.1
@@ -145,11 +145,11 @@ BuildRequires: ansible >= 2.9.10
%global rolename12 nbde_client
#%%deftag 12 1.0.1
-%defcommit 13 0376ceece57882ade8ffaf431b7866aae3e7fed1
+%defcommit 13 23f1a414ab022a506614c5be8eadf1708dc45b2b
%global rolename13 certificate
#%%deftag 13 1.0.1
-%defcommit 14 2e2941c5545571fc8bc494099bdf970f498b9d38
+%defcommit 14 ff335b87017954c0b47bfe818700e0f1600b04db
%global rolename14 crypto_policies
%global forgeorg15 https://github.com/willshersystems/
@@ -157,10 +157,10 @@ BuildRequires: ansible >= 2.9.10
%global rolename15 sshd
%defcommit 15 428d390668077f0baf5e88c5834ee810ae11113c
-%defcommit 16 21adc637511db86b5ba279a70a7301ef3a170669
+%defcommit 16 54bec0855966cc3eed65b26a7c90962eb103d66d
%global rolename16 ssh
-%defcommit 17 779bb78559de58bb5a1f25a4b92039c373ef59a4
+%defcommit 17 d97f48a21002497e1ac1bd1385841f2939d7b840
%global rolename17 ha_cluster
%global mainid e9e30b03c0fe9387cb0ea8a5e7aac8313de2deef
https://src.fedoraproject.org/rpms/linux-system-roles/c/c467cf8b5c425a813...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "update changelog for
sshd rebase (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From adc3f96d51da9ff8175fcbc5fdc285400c4b259a Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:40 +0000
Subject: update changelog for sshd rebase
Related: rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 550c05c..927ecda 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -789,6 +789,8 @@ popd
Resolves rhbz#1937938
- rebase metrics role to latest upstream
Resolves rhbz#1937938
+- rebase sshd role to latest upstream
+ Resolves rhbz#1937938
* Tue Apr 13 2021 Noriko Hosoi <nhosoi(a)redhat.com> - 1.0.1-2
- Adding the -collection-artifact subpackage, enabled using
https://src.fedoraproject.org/rpms/linux-system-roles/c/adc3f96d51da9ff81...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "rebase sshd role to
latest upstream (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From 3f9a4629cb078df559b60538fa3fa759d3d6faea Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:58:36 +0000
Subject: rebase sshd role to latest upstream
Resolves rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 84f27d1..550c05c 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -155,7 +155,7 @@ BuildRequires: ansible >= 2.9.10
%global forgeorg15 https://github.com/willshersystems/
%global repo15 ansible-sshd
%global rolename15 sshd
-%defcommit 15 e1de59b3c54e9d48a010eeca73755df339c7e628
+%defcommit 15 428d390668077f0baf5e88c5834ee810ae11113c
%defcommit 16 21adc637511db86b5ba279a70a7301ef3a170669
%global rolename16 ssh
@@ -204,9 +204,6 @@ Patch54: network-ansible-test.diff
Patch61: storage-ansible-test.diff
-Patch151: sshd-example.diff
-Patch152: sshd-work-on-ansible28-jinja27.diff
-
BuildArch: noarch
# These are needed for md2html.sh to build the documentation
@@ -279,8 +276,6 @@ cd %{rolename6}
%patch61 -p1
cd ..
cd %{rolename15}
-%patch151 -p1
-%patch152 -p1
sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" tests/*.yml examples/*.yml
sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" tests/*.yml examples/*.yml README.md
cd ..
diff --git a/sshd-example.diff b/sshd-example.diff
deleted file mode 100644
index 48243e3..0000000
--- a/sshd-example.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/README.md b/README.md
-index 676ad72..dc06d85 100644
---- a/README.md
-+++ b/README.md
-@@ -190,7 +190,7 @@ defaults. This is useful if the role is used in deployment stage to make sure
- the service is able to start on the first attempt. To disable this check, set
- this to empty list.
-
--* `sshd_hostkey_owner`, `sshd_hostkey_group`, `sshd_hostkey_group`
-+* `sshd_hostkey_owner`, `sshd_hostkey_group`, `sshd_hostkey_mode`
-
- Use these variables to set the ownership and permissions for the host keys from
- the above list.
-@@ -273,6 +273,8 @@ for example:
- X11Forwarding: yes
- ```
-
-+More example playbooks can be found in [`examples/`](examples/) directory.
-+
- Template Generation
- -------------------
-
-diff --git a/examples/example-root-login.yml b/examples/example-root-login.yml
-new file mode 100644
-index 0000000..156e629
---- /dev/null
-+++ b/examples/example-root-login.yml
-@@ -0,0 +1,15 @@
-+---
-+- hosts: all
-+ tasks:
-+ - name: Configure sshd to prevent root and password login except from particular subnet
-+ include_role:
-+ name: ansible-sshd
-+ vars:
-+ sshd:
-+ # root login and password login is enabled only from a particular subnet
-+ PermitRootLogin: no
-+ PasswordAuthentication: no
-+ Match:
-+ - Condition: "Address 192.0.2.0/24"
-+ PermitRootLogin: yes
-+ PasswordAuthentication: yes
diff --git a/sshd-work-on-ansible28-jinja27.diff b/sshd-work-on-ansible28-jinja27.diff
deleted file mode 100644
index 268d31f..0000000
--- a/sshd-work-on-ansible28-jinja27.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From bb612fb6c5f76a40fce368acb43d2847e699213d Mon Sep 17 00:00:00 2001
-From: Rich Megginson <rmeggins(a)redhat.com>
-Date: Thu, 28 Jan 2021 15:56:14 -0700
-Subject: [PATCH] use state: absent instead of state: missing
-
----
- tests/tests_hostkeys_missing.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/tests_hostkeys_missing.yml b/tests/tests_hostkeys_missing.yml
-index 9dfe77b..5790684 100644
---- a/tests/tests_hostkeys_missing.yml
-+++ b/tests/tests_hostkeys_missing.yml
-@@ -40,7 +40,7 @@
- - name: Make sure the key was not created
- file:
- path: /tmp/missing_ssh_host_rsa_key
-- state: missing
-+ state: absent
- register: key
- failed_when: key.changed
- tags: tests::verify
---
-2.29.2
-
https://src.fedoraproject.org/rpms/linux-system-roles/c/3f9a4629cb078df55...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "update changelog for
metrics rebase (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From fc6594cf3eff4eabad30f3f5e42da056d28814e0 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:57:09 +0000
Subject: update changelog for metrics rebase
Related: rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 608a178..84f27d1 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -792,6 +792,8 @@ popd
Resolves rhbz#1939711
- rebase postfix role to latest upstream
Resolves rhbz#1937938
+- rebase metrics role to latest upstream
+ Resolves rhbz#1937938
* Tue Apr 13 2021 Noriko Hosoi <nhosoi(a)redhat.com> - 1.0.1-2
- Adding the -collection-artifact subpackage, enabled using
https://src.fedoraproject.org/rpms/linux-system-roles/c/fc6594cf3eff4eaba...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "update sources for
metrics rebase (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From 55f660ae02f87d32b5a71ea776269993fb944407 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:57:09 +0000
Subject: update sources for metrics rebase
Related: rhbz#1937938
---
diff --git a/.gitignore b/.gitignore
index 5582c55..63239ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,5 +42,6 @@
/timesync-8a95989e158519ce4bebe10091c47ef88b29261b.tar.gz
/selinux-557546f922886fc1e73012f2af08ec80fec82fe2.tar.gz
/storage-2c3eeb8b2dd898d8c589a0740c2ba9b707e4ed2c.tar.gz
+/metrics-c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579.tar.gz
/network-0f5a882bcab58baba527015b7cde01c7c52d2254.tar.gz
/postfix-bbf5784849d362cc3443fde8b09da26ea698a8ce.tar.gz
diff --git a/sources b/sources
index 4b3c4ff..5a6d87c 100644
--- a/sources
+++ b/sources
@@ -4,7 +4,7 @@ SHA512 (timesync-8a95989e158519ce4bebe10091c47ef88b29261b.tar.gz) = 63bac1164295
SHA512 (network-0f5a882bcab58baba527015b7cde01c7c52d2254.tar.gz) = 6744d1d7926121da465b24a5913020753c06d5f82f43c69e55f0549429a15344bcd1f88793fa845a0ca02ba0a02473397af71cd5effb35e1cf9f1702dbed4372
SHA512 (selinux-557546f922886fc1e73012f2af08ec80fec82fe2.tar.gz) = aa6e1ca4e0a5ccba486d4cb554f7112a718afcb5c245b92464f047fff922efe53e2d39fdf39c784a51f54e950be1a49e9591e2f96227f42f97af3ed89cbacad9
SHA512 (storage-2c3eeb8b2dd898d8c589a0740c2ba9b707e4ed2c.tar.gz) = c9059087870970cdf184c2001f5b22f89ff07e97e3baa075d50e7aa8d1624af440a344bd772eaf8c484bab8064c295d76e8646a8c88944a06160399139d9ca03
-SHA512 (metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz) = 738685dd645eda7d5647cb2dbba90bc0343430dc7b2aaebe9a9e75e67e13011872eb1df234840352844bc0732ee1f88f0a5ff0e2012c44dac6e8394a0ff2b9ec
+SHA512 (metrics-c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579.tar.gz) = c9b6be06ff39fa030c65a36940c717c40a6e0d484f2a3bc76f5289ed72f034875f83fa0c08140a2e9aabb1bb9dd8abed0321a2e25ab01687bb314717e5b2f005
SHA512 (tlog-1.1.0.tar.gz) = f9f36fb2bfc76687652424ecab70c1e11b435551cb373a483c1fde6c7c68013a95a1b313e1187ff5495b22fdf7b56f9e6c97f3015d8144f21bed6617916c07e9
SHA512 (kernel_settings-4c81fd1380712ab0641b6837f092dd9caeeae0a6.tar.gz) = 87a2348de424abfb4f43b69878db250f02ab9eedbc2906cabe15e202934149f0890f88d632106c6af9e6461984d2ace3856f3718f21a3b5ba8ffb68c8e268fe8
SHA512 (logging-07e08107e7ccba5822f8a7aaec1a2ff0a221bede.tar.gz) = 1921f9d8595d26e0f2dbc35976308b89c5b9f826763d04948c9a9533d07055d5ec26094b5c4492da248002f8de0200aaebd4920fa0d7ba000ec8b3513ed23ea6
https://src.fedoraproject.org/rpms/linux-system-roles/c/55f660ae02f87d32b...
3Â years, 1Â month
rmeggins pushed to linux-system-roles (f34). "rebase metrics role to
latest upstream (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-04-30 14:34:23 UTC
From c1cdd1253aa52d651f8c82ccd9ada0b5b69f0d53 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:57:09 +0000
Subject: rebase metrics role to latest upstream
Resolves: rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 98e8d9e..608a178 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -121,7 +121,7 @@ BuildRequires: ansible >= 2.9.10
%global rolename6 storage
#%%deftag 6 1.2.2
-%defcommit 7 e81b2650108727f38b1c856699aad26af0f44a46
+%defcommit 7 c9b2ee085ccc741b5a9fa8a4b2a7a2f8c8551579
%global rolename7 metrics
#%%deftag 7 0.1.0
@@ -204,8 +204,6 @@ Patch54: network-ansible-test.diff
Patch61: storage-ansible-test.diff
-Patch71: metrics-mssql-x86.diff
-
Patch151: sshd-example.diff
Patch152: sshd-work-on-ansible28-jinja27.diff
@@ -280,9 +278,6 @@ cd ..
cd %{rolename6}
%patch61 -p1
cd ..
-cd %{rolename7}
-%patch71 -p1
-cd ..
cd %{rolename15}
%patch151 -p1
%patch152 -p1
diff --git a/metrics-mssql-x86.diff b/metrics-mssql-x86.diff
deleted file mode 100644
index 80bb0e5..0000000
--- a/metrics-mssql-x86.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ff86f2fa05998afcd8ae87d9cdd660ef5b6ee2c Mon Sep 17 00:00:00 2001
-From: Jan Kurik <jkurik(a)redhat.com>
-Date: Thu, 18 Feb 2021 17:09:48 +1100
-Subject: [PATCH] Update mssql test to exclude non-x86_64 architectures
-
-pcp-pmda-mssql (and SQL Server itself) are x86_64-only.
----
- tests/tests_sanity_mssql.yml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/tests_sanity_mssql.yml b/tests/tests_sanity_mssql.yml
-index 6f1e2cc..8602c36 100644
---- a/tests/tests_sanity_mssql.yml
-+++ b/tests/tests_sanity_mssql.yml
-@@ -12,7 +12,8 @@
- - meta: end_host
- when: (ansible_distribution in ['RedHat'] and
- ( ansible_facts['distribution_version'] is version('8.4', '<'))) or
-- ansible_distribution not in ['Fedora', 'RedHat']
-+ ansible_distribution not in ['Fedora', 'RedHat'] or
-+ ansible_architecture not in ['x86_64']
-
- - name: Save state of services
- import_tasks: get_services_state.yml
https://src.fedoraproject.org/rpms/linux-system-roles/c/c1cdd1253aa52d651...
3Â years, 1Â month