import rhel-system-roles-1.0-10.el8_1
This commit is contained in:
parent
3ee7082020
commit
30f48e75d8
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,4 +2,5 @@ SOURCES/kdump-0c2bb28.tar.gz
|
|||||||
SOURCES/network-d5891d4.tar.gz
|
SOURCES/network-d5891d4.tar.gz
|
||||||
SOURCES/postfix-0.1.tar.gz
|
SOURCES/postfix-0.1.tar.gz
|
||||||
SOURCES/selinux-6cd1ec8.tar.gz
|
SOURCES/selinux-6cd1ec8.tar.gz
|
||||||
|
SOURCES/storage-1594e25.tar.gz
|
||||||
SOURCES/timesync-924650d.tar.gz
|
SOURCES/timesync-924650d.tar.gz
|
||||||
|
@ -2,4 +2,5 @@
|
|||||||
530aaa9302d90c278b9e1c8d8513e516494e3380 SOURCES/network-d5891d4.tar.gz
|
530aaa9302d90c278b9e1c8d8513e516494e3380 SOURCES/network-d5891d4.tar.gz
|
||||||
66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz
|
66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz
|
||||||
246383bd6823533ed3a51a0501b75e38ba852908 SOURCES/selinux-6cd1ec8.tar.gz
|
246383bd6823533ed3a51a0501b75e38ba852908 SOURCES/selinux-6cd1ec8.tar.gz
|
||||||
|
aa1c37b04cef831148d9834033fe414156ba62df SOURCES/storage-1594e25.tar.gz
|
||||||
ffd2a706e4e3007684aa9874c8457ad5c8920050 SOURCES/timesync-924650d.tar.gz
|
ffd2a706e4e3007684aa9874c8457ad5c8920050 SOURCES/timesync-924650d.tar.gz
|
||||||
|
13
SOURCES/rhel-system-roles-storage-prefix.diff
Normal file
13
SOURCES/rhel-system-roles-storage-prefix.diff
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/README.md b/README.md
|
||||||
|
index c2debc9..d9e40b3 100644
|
||||||
|
--- a/README.md
|
||||||
|
+++ b/README.md
|
||||||
|
@@ -81,7 +81,7 @@ Example Playbook
|
||||||
|
- hosts: all
|
||||||
|
|
||||||
|
roles:
|
||||||
|
- - name: linux-system-roles.storage
|
||||||
|
+ - name: rhel-system-roles.storage
|
||||||
|
storage_pools:
|
||||||
|
- name: app
|
||||||
|
disks:
|
1021
SOURCES/storage-safemode.diff
Normal file
1021
SOURCES/storage-safemode.diff
Normal file
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@ Name: linux-system-roles
|
|||||||
%endif
|
%endif
|
||||||
Summary: Set of interfaces for unified system management
|
Summary: Set of interfaces for unified system management
|
||||||
Version: 1.0
|
Version: 1.0
|
||||||
Release: 7%{?dist}
|
Release: 10%{?dist}
|
||||||
|
|
||||||
#Group: Development/Libraries
|
#Group: Development/Libraries
|
||||||
License: GPLv3+ and MIT and BSD
|
License: GPLv3+ and MIT and BSD
|
||||||
@ -46,11 +46,16 @@ License: GPLv3+ and MIT and BSD
|
|||||||
%global rolename5 network
|
%global rolename5 network
|
||||||
#%%deftag 5 1.0.0
|
#%%deftag 5 1.0.0
|
||||||
|
|
||||||
|
%defcommit 6 1594e2527c4eca0fa2876d4cc3ff6395ed280b8d
|
||||||
|
%global rolename6 storage
|
||||||
|
#%%deftag 6 1.0.2
|
||||||
|
|
||||||
Source: https://github.com/linux-system-roles/%{rolename0}/archive/%{id0}.tar.gz#/%{rolename0}-%{shortid0}.tar.gz
|
Source: https://github.com/linux-system-roles/%{rolename0}/archive/%{id0}.tar.gz#/%{rolename0}-%{shortid0}.tar.gz
|
||||||
Source1: https://github.com/linux-system-roles/%{rolename1}/archive/%{id1}.tar.gz#/%{rolename1}-%{shortid1}.tar.gz
|
Source1: https://github.com/linux-system-roles/%{rolename1}/archive/%{id1}.tar.gz#/%{rolename1}-%{shortid1}.tar.gz
|
||||||
Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{id2}.tar.gz#/%{rolename2}-%{shortid2}.tar.gz
|
Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{id2}.tar.gz#/%{rolename2}-%{shortid2}.tar.gz
|
||||||
Source3: https://github.com/linux-system-roles/%{rolename3}/archive/%{id3}.tar.gz#/%{rolename3}-%{shortid3}.tar.gz
|
Source3: https://github.com/linux-system-roles/%{rolename3}/archive/%{id3}.tar.gz#/%{rolename3}-%{shortid3}.tar.gz
|
||||||
Source5: https://github.com/linux-system-roles/%{rolename5}/archive/%{id5}.tar.gz#/%{rolename5}-%{shortid5}.tar.gz
|
Source5: https://github.com/linux-system-roles/%{rolename5}/archive/%{id5}.tar.gz#/%{rolename5}-%{shortid5}.tar.gz
|
||||||
|
Source6: https://github.com/linux-system-roles/%{rolename6}/archive/%{id6}.tar.gz#/%{rolename6}-%{shortid6}.tar.gz
|
||||||
|
|
||||||
Source8: md2html.sh
|
Source8: md2html.sh
|
||||||
|
|
||||||
@ -59,6 +64,7 @@ Patch1: rhel-system-roles-%{rolename1}-prefix.diff
|
|||||||
Patch2: rhel-system-roles-%{rolename2}-prefix.diff
|
Patch2: rhel-system-roles-%{rolename2}-prefix.diff
|
||||||
Patch3: rhel-system-roles-%{rolename3}-prefix.diff
|
Patch3: rhel-system-roles-%{rolename3}-prefix.diff
|
||||||
Patch5: rhel-system-roles-%{rolename5}-prefix.diff
|
Patch5: rhel-system-roles-%{rolename5}-prefix.diff
|
||||||
|
Patch6: rhel-system-roles-%{rolename6}-prefix.diff
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Patch11: rhel-system-roles-postfix-pr5.diff
|
Patch11: rhel-system-roles-postfix-pr5.diff
|
||||||
@ -74,6 +80,8 @@ Patch52: network-permissions.diff
|
|||||||
Patch53: network-tier1-tags.diff
|
Patch53: network-tier1-tags.diff
|
||||||
Patch54: rhel-system-roles-network-pr121.diff
|
Patch54: rhel-system-roles-network-pr121.diff
|
||||||
|
|
||||||
|
Patch61: storage-safemode.diff
|
||||||
|
|
||||||
Url: https://github.com/linux-system-roles/
|
Url: https://github.com/linux-system-roles/
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -100,7 +108,7 @@ of Fedora, Red Hat Enterprise Linux & CentOS.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -qc -a1 -a2 -a3 -a5
|
%setup -qc -a1 -a2 -a3 -a5 -a6
|
||||||
cd %{rolename0}-%{id0}
|
cd %{rolename0}-%{id0}
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
@ -131,6 +139,12 @@ cd %{rolename5}-%{id5}
|
|||||||
%patch53 -p1
|
%patch53 -p1
|
||||||
%patch54 -p1
|
%patch54 -p1
|
||||||
cd ..
|
cd ..
|
||||||
|
cd %{rolename6}-%{id6}
|
||||||
|
%if "%{roleprefix}" != "linux-system-roles."
|
||||||
|
%patch6 -p1
|
||||||
|
%endif
|
||||||
|
%patch61 -p1
|
||||||
|
cd ..
|
||||||
|
|
||||||
%build
|
%build
|
||||||
sh %{SOURCE8} \
|
sh %{SOURCE8} \
|
||||||
@ -138,7 +152,8 @@ sh %{SOURCE8} \
|
|||||||
%{rolename1}-%{id1}/README.md \
|
%{rolename1}-%{id1}/README.md \
|
||||||
%{rolename2}-%{id2}/README.md \
|
%{rolename2}-%{id2}/README.md \
|
||||||
%{rolename3}-%{id3}/README.md \
|
%{rolename3}-%{id3}/README.md \
|
||||||
%{rolename5}-%{id5}/README.md
|
%{rolename5}-%{id5}/README.md \
|
||||||
|
%{rolename6}-%{id6}/README.md
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles
|
||||||
@ -148,6 +163,7 @@ cp -pR %{rolename1}-%{id1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolep
|
|||||||
cp -pR %{rolename2}-%{id2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2}
|
cp -pR %{rolename2}-%{id2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2}
|
||||||
cp -pR %{rolename3}-%{id3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3}
|
cp -pR %{rolename3}-%{id3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3}
|
||||||
cp -pR %{rolename5}-%{id5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5}
|
cp -pR %{rolename5}-%{id5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5}
|
||||||
|
cp -pR %{rolename6}-%{id6} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename6}
|
||||||
|
|
||||||
%if 0%{?rolealtprefix:1}
|
%if 0%{?rolealtprefix:1}
|
||||||
ln -s %{roleprefix}%{rolename0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename0}
|
ln -s %{roleprefix}%{rolename0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename0}
|
||||||
@ -155,6 +171,7 @@ ln -s %{roleprefix}%{rolename1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{
|
|||||||
ln -s %{roleprefix}%{rolename2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename2}
|
ln -s %{roleprefix}%{rolename2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename2}
|
||||||
ln -s %{roleprefix}%{rolename3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename3}
|
ln -s %{roleprefix}%{rolename3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename3}
|
||||||
ln -s %{roleprefix}%{rolename5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename5}
|
ln -s %{roleprefix}%{rolename5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename5}
|
||||||
|
ln -s %{roleprefix}%{rolename6} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolealtprefix}%{rolename6}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/kdump
|
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/kdump
|
||||||
@ -162,6 +179,7 @@ mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/postfix
|
|||||||
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/selinux
|
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/selinux
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/timesync
|
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/timesync
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/network
|
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/network
|
||||||
|
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/storage
|
||||||
|
|
||||||
cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/README.md \
|
cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/README.md \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/README.html \
|
$RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/README.html \
|
||||||
@ -217,7 +235,12 @@ mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/ethtoo
|
|||||||
$RPM_BUILD_ROOT%{_pkgdocdir}/network/example-ethtool-features-playbook.yml
|
$RPM_BUILD_ROOT%{_pkgdocdir}/network/example-ethtool-features-playbook.yml
|
||||||
mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/ethtool-features-default.yml \
|
mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/ethtool-features-default.yml \
|
||||||
$RPM_BUILD_ROOT%{_pkgdocdir}/network/example-ethtool-features-default-playbook.yml
|
$RPM_BUILD_ROOT%{_pkgdocdir}/network/example-ethtool-features-default-playbook.yml
|
||||||
|
|
||||||
|
cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}storage/README.md \
|
||||||
|
$RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}storage/README.html \
|
||||||
|
$RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}storage/LICENSE \
|
||||||
|
$RPM_BUILD_ROOT%{_pkgdocdir}/storage
|
||||||
|
|
||||||
|
|
||||||
rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/semaphore
|
rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/semaphore
|
||||||
rm -r $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/molecule
|
rm -r $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/molecule
|
||||||
@ -238,12 +261,14 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples
|
|||||||
%{_datadir}/ansible/roles/%{rolealtprefix}selinux
|
%{_datadir}/ansible/roles/%{rolealtprefix}selinux
|
||||||
%{_datadir}/ansible/roles/%{rolealtprefix}timesync
|
%{_datadir}/ansible/roles/%{rolealtprefix}timesync
|
||||||
%{_datadir}/ansible/roles/%{rolealtprefix}network
|
%{_datadir}/ansible/roles/%{rolealtprefix}network
|
||||||
|
%{_datadir}/ansible/roles/%{rolealtprefix}storage
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/ansible/roles/%{roleprefix}kdump
|
%{_datadir}/ansible/roles/%{roleprefix}kdump
|
||||||
%{_datadir}/ansible/roles/%{roleprefix}postfix
|
%{_datadir}/ansible/roles/%{roleprefix}postfix
|
||||||
%{_datadir}/ansible/roles/%{roleprefix}selinux
|
%{_datadir}/ansible/roles/%{roleprefix}selinux
|
||||||
%{_datadir}/ansible/roles/%{roleprefix}timesync
|
%{_datadir}/ansible/roles/%{roleprefix}timesync
|
||||||
%{_datadir}/ansible/roles/%{roleprefix}network
|
%{_datadir}/ansible/roles/%{roleprefix}network
|
||||||
|
%{_datadir}/ansible/roles/%{roleprefix}storage
|
||||||
%doc %{_pkgdocdir}/*/example-*-playbook.yml
|
%doc %{_pkgdocdir}/*/example-*-playbook.yml
|
||||||
%doc %{_pkgdocdir}/network/example-inventory
|
%doc %{_pkgdocdir}/network/example-inventory
|
||||||
%doc %{_pkgdocdir}/*/README.md
|
%doc %{_pkgdocdir}/*/README.md
|
||||||
@ -253,11 +278,13 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples
|
|||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}selinux/README.md
|
%doc %{_datadir}/ansible/roles/%{roleprefix}selinux/README.md
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}timesync/README.md
|
%doc %{_datadir}/ansible/roles/%{roleprefix}timesync/README.md
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}network/README.md
|
%doc %{_datadir}/ansible/roles/%{roleprefix}network/README.md
|
||||||
|
%doc %{_datadir}/ansible/roles/%{roleprefix}storage/README.md
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}kdump/README.html
|
%doc %{_datadir}/ansible/roles/%{roleprefix}kdump/README.html
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}postfix/README.html
|
%doc %{_datadir}/ansible/roles/%{roleprefix}postfix/README.html
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}selinux/README.html
|
%doc %{_datadir}/ansible/roles/%{roleprefix}selinux/README.html
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}timesync/README.html
|
%doc %{_datadir}/ansible/roles/%{roleprefix}timesync/README.html
|
||||||
%doc %{_datadir}/ansible/roles/%{roleprefix}network/README.html
|
%doc %{_datadir}/ansible/roles/%{roleprefix}network/README.html
|
||||||
|
%doc %{_datadir}/ansible/roles/%{roleprefix}storage/README.html
|
||||||
|
|
||||||
|
|
||||||
%license %{_pkgdocdir}/*/COPYING
|
%license %{_pkgdocdir}/*/COPYING
|
||||||
@ -267,8 +294,16 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples
|
|||||||
%license %{_datadir}/ansible/roles/%{roleprefix}selinux/COPYING
|
%license %{_datadir}/ansible/roles/%{roleprefix}selinux/COPYING
|
||||||
%license %{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING
|
%license %{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING
|
||||||
%license %{_datadir}/ansible/roles/%{roleprefix}network/LICENSE
|
%license %{_datadir}/ansible/roles/%{roleprefix}network/LICENSE
|
||||||
|
%license %{_datadir}/ansible/roles/%{roleprefix}storage/LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 21 2019 Pavel Cahyna <pcahyna@redhat.com> - 1.0-10
|
||||||
|
- Add the storage_safe_mode option, true by default, to prevent accidental
|
||||||
|
data removal: rhbz#1763242, issue #42, PR #43 and #51.
|
||||||
|
|
||||||
|
* Thu Aug 15 2019 Pavel Cahyna <pcahyna@redhat.com> - 1.0-9
|
||||||
|
- Add the storage role
|
||||||
|
|
||||||
* Thu Jun 13 2019 Pavel Cahyna <pcahyna@redhat.com> - 1.0-7
|
* Thu Jun 13 2019 Pavel Cahyna <pcahyna@redhat.com> - 1.0-7
|
||||||
- Update tests for the network role
|
- Update tests for the network role
|
||||||
- Fix typo in a test for the timesync role
|
- Fix typo in a test for the timesync role
|
||||||
|
Loading…
Reference in New Issue
Block a user