diff --git a/.gitignore b/.gitignore index 869ff4c..6073b13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/kdump-0.1.tar.gz -SOURCES/network-0.2.tar.gz +SOURCES/network-b9b6f0a.tar.gz SOURCES/postfix-0.1.tar.gz SOURCES/selinux-0.1.tar.gz SOURCES/timesync-0.1.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 4d6e0b7..9bed809 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,5 +1,5 @@ f565f627f199d146cda3404de5b65c5f50e3702a SOURCES/kdump-0.1.tar.gz -6607de79cb39c89b25d058e3c84455f4e3a51bef SOURCES/network-0.2.tar.gz +3433e21c82dbe0bf1c4a334a98625cc682b4101b SOURCES/network-b9b6f0a.tar.gz 66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz b25009fdba1af0c1eec922df01f38d85ffb401f9 SOURCES/selinux-0.1.tar.gz 47b5287fbbf4e268414d28d503fe9be8b72c7747 SOURCES/timesync-0.1.tar.gz diff --git a/SOURCES/fix-selinux-disabled-pr2.diff b/SOURCES/fix-selinux-disabled-pr2.diff new file mode 100644 index 0000000..9838261 --- /dev/null +++ b/SOURCES/fix-selinux-disabled-pr2.diff @@ -0,0 +1,117 @@ +diff --git a/tasks/main.yml b/tasks/main.yml +index e10b2f2..7d7479d 100644 +--- a/tasks/main.yml ++++ b/tasks/main.yml +@@ -14,9 +14,6 @@ + state: present + when: ansible_distribution == "Fedora" + +-- name: Drop all local modifications first +- shell: echo "{{drop_local_modifications}}" | /usr/sbin/semanage -i - +- + - name: Set permanent SELinux mode + selinux: policy={{ SELinux_type }} state={{ SELinux_mode }} + when: SELinux_mode is defined +@@ -25,6 +22,13 @@ + command: /usr/sbin/setenforce {{ SELinux_mode }} + when: SELinux_mode is defined and SELinux_change_running is defined + ++- name: Drop all local modifications ++ shell: echo "{{drop_local_modifications}}" | /usr/sbin/semanage -i - ++ ++- name: Reload SELinux policy ++ command: semodule -R ++ when: ansible_selinux.status != "disabled" ++ + - name: Set SELinux booleans + seboolean: + name: "{{ item.name }}" +diff --git a/test/selinux.config b/test/selinux.config +new file mode 100644 +index 0000000..a520b96 +--- /dev/null ++++ b/test/selinux.config +@@ -0,0 +1,14 @@ ++ ++# This file controls the state of SELinux on the system. ++# SELINUX= can take one of these three values: ++# enforcing - SELinux security policy is enforced. ++# permissive - SELinux prints warnings instead of enforcing. ++# disabled - No SELinux policy is loaded. ++SELINUX=disabled ++# SELINUXTYPE= can take one of these three values: ++# targeted - Targeted processes are protected, ++# minimum - Modification of targeted policy. Only selected processes are protected. ++# mls - Multi Level Security protection. ++SELINUXTYPE=targeted ++ ++ +diff --git a/test/test_selinux_disabled.yml b/test/test_selinux_disabled.yml +new file mode 100644 +index 0000000..b13bfef +--- /dev/null ++++ b/test/test_selinux_disabled.yml +@@ -0,0 +1,48 @@ ++ ++- name: Ensure the default is targeted, enforcing, without local modifications ++ hosts: all ++ become: true ++ vars: ++ SELinux_type: targeted ++ SELinux_mode: enforcing ++ ++ pre_tasks: ++ - name: Backup original /etc/selinux/config ++ copy: ++ remote_src: true ++ src: /etc/selinux/config ++ dest: /etc/selinux/config.test_selinux_disabled ++ - name: Upload testing /etc/selinux/config ++ copy: ++ src: selinux.config ++ dest: /etc/selinux/config ++ - name: Switch to permissive to allow login when selinuxfs is not mounted ++ command: setenforce 0 ++ when: ansible_selinux.status != "disabled" ++ - name: Get selinuxfs mountpoint ++ shell: findmnt -n -t selinuxfs --output=target ++ register: selinux_mountpoint ++ - name: Umount {{ selinux_mountpoint.stdout }} to emulate SELinux disabled system ++ command: umount {{ selinux_mountpoint.stdout }} ++ ++ roles: ++ - selinux ++ ++ tasks: ++ - name: Mount {{ selinux_mountpoint.stdout }} back to system ++ command: mount -t selinuxfs selinuxfs {{ selinux_mountpoint.stdout }} ++ - name: Switch back to enforcing ++ command: setenforce 1 ++ - name: Gather facts again ++ setup: ++ - name: Check SELinux config mode ++ assert: ++ that: "{{ ansible_selinux.config_mode == 'enforcing' }}" ++ mgs: "SELinux config mode should be enforcing instead of {{ ansible_selinux.config_mode }}" ++ - name: Restore original /etc/selinux/config ++ copy: ++ remote_src: true ++ dest: /etc/selinux/config ++ src: /etc/selinux/config.test_selinux_disabled ++ - name: Remove /etc/selinux/config backup ++ command: rm /etc/selinux/config.test_selinux_disabled +diff --git a/vars/main.yml b/vars/main.yml +index 74ae42f..4dcb80d 100644 +--- a/vars/main.yml ++++ b/vars/main.yml +@@ -1,6 +1,6 @@ + --- + drop_local_modifications: | +- boolean -D +- login -D +- port -D +- fcontext -D ++ boolean -D -N ++ login -D -N ++ port -D -N ++ fcontext -D -N diff --git a/SOURCES/rhel-system-roles-network-prefix.diff b/SOURCES/rhel-system-roles-network-prefix.diff index 350c8c1..8964fea 100644 --- a/SOURCES/rhel-system-roles-network-prefix.diff +++ b/SOURCES/rhel-system-roles-network-prefix.diff @@ -1,25 +1,25 @@ diff --git a/examples/bond-with-vlan.yml b/examples/bond-with-vlan.yml -index d120f13..fdabb75 100644 +index d120f13..4023c8d 100644 --- a/examples/bond-with-vlan.yml +++ b/examples/bond-with-vlan.yml @@ -34,4 +34,4 @@ - - "192.168.174.{{ network_iphost }}/24" + - "192.0.2.{{ network_iphost }}/24" roles: - - network -+ - rhel-system-roles.network ++ - linux-system-roles.network diff --git a/examples/bridge-with-vlan.yml b/examples/bridge-with-vlan.yml -index ce48443..19c4303 100644 +index ce48443..63c935b 100644 --- a/examples/bridge-with-vlan.yml +++ b/examples/bridge-with-vlan.yml @@ -32,4 +32,4 @@ - - "192.168.174.{{ network_iphost }}/24" + - "192.0.2.{{ network_iphost }}/24" roles: - - network -+ - rhel-system-roles.network ++ - linux-system-roles.network diff --git a/examples/eth-simple-auto.yml b/examples/eth-simple-auto.yml -index 5934ca8..aaaa114 100644 +index 5934ca8..8fa0147 100644 --- a/examples/eth-simple-auto.yml +++ b/examples/eth-simple-auto.yml @@ -14,4 +14,4 @@ @@ -27,14 +27,24 @@ index 5934ca8..aaaa114 100644 roles: - - network -+ - rhel-system-roles.network ++ - linux-system-roles.network diff --git a/examples/eth-with-vlan.yml b/examples/eth-with-vlan.yml -index d269886..b9bac22 100644 +index d269886..fb9b2d9 100644 --- a/examples/eth-with-vlan.yml +++ b/examples/eth-with-vlan.yml @@ -24,4 +24,4 @@ - - "192.168.174.{{ network_iphost }}/24" + - "192.0.2.{{ network_iphost }}/24" roles: - - network -+ - rhel-system-roles.network ++ - linux-system-roles.network +diff --git a/examples/infiniband.yml b/examples/infiniband.yml +index ca1db67..1054e70 100644 +--- a/examples/infiniband.yml ++++ b/examples/infiniband.yml +@@ -21,4 +21,4 @@ + - 10.0.0.5/30 + + roles: +- - network ++ - linux-system-roles.network diff --git a/SOURCES/rhel-system-roles-network-rfc7042.diff b/SOURCES/rhel-system-roles-network-rfc7042.diff deleted file mode 100644 index c028d5e..0000000 --- a/SOURCES/rhel-system-roles-network-rfc7042.diff +++ /dev/null @@ -1,38 +0,0 @@ -From f3ead892403929d71aa284287a8ca22353ab6b95 Mon Sep 17 00:00:00 2001 -From: Pavel Cahyna -Date: Fri, 23 Jun 2017 16:20:00 +0200 -Subject: [PATCH] Use proper reserved MAC addresses for documentation, - according to RFC 7042. - ---- - README.md | 2 +- - examples/inventory | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/README.md b/README.md -index 8b92202..21a5c28 100644 ---- a/README.md -+++ b/README.md -@@ -100,7 +100,7 @@ network_connections: - #state: present # default, as a type is present - type: "ethernet" - autoconnect: yes -- mac: "d6:06:b9:56:12:5d" -+ mac: "00:00:5e:00:53:5d" - ip: - dhcp4: yes - ``` -diff --git a/examples/inventory b/examples/inventory -index 645fdf6..94ffdfe 100644 ---- a/examples/inventory -+++ b/examples/inventory -@@ -1,4 +1,4 @@ - # an inventory for the examples. - [network-test] --v-rhel6 ansible_user=root network_iphost=196 network_mac1=52:54:00:44:9f:ba network_interface_name1=eth0 network_interface_name2=eth1 --v-rhel7 ansible_user=root network_iphost=97 network_mac1=52:54:00:05:f5:b3 network_interface_name1=eth0 network_interface_name2=eth1 -+v-rhel6 ansible_user=root network_iphost=196 network_mac1=00:00:5e:00:53:00 network_interface_name1=eth0 network_interface_name2=eth1 -+v-rhel7 ansible_user=root network_iphost=97 network_mac1=00:00:5e:00:53:01 network_interface_name1=eth0 network_interface_name2=eth1 --- -2.9.4 - diff --git a/SOURCES/rhel-system-roles-postfix-prefix.diff b/SOURCES/rhel-system-roles-postfix-prefix.diff index 3f516e8..65ab2a1 100644 --- a/SOURCES/rhel-system-roles-postfix-prefix.diff +++ b/SOURCES/rhel-system-roles-postfix-prefix.diff @@ -7,7 +7,7 @@ index 5950215..a59d72f 100644 relay_host: "example.com" roles: - - postfix -+ - rhel-system-roles.postfix ++ - linux-system-roles.postfix ``` Install and enable postfix. Do not run 'postfix check' before restarting @@ -16,7 +16,7 @@ index 5950215..a59d72f 100644 postfix_check: false roles: - - postfix -+ - rhel-system-roles.postfix ++ - linux-system-roles.postfix ``` Install and enable postfix. Do single backup of main.cf (older backup will be @@ -25,7 +25,7 @@ index 5950215..a59d72f 100644 postfix_backup: true roles: - - postfix -+ - rhel-system-roles.postfix ++ - linux-system-roles.postfix ``` Install and enable postfix. Do timestamped backup of main.cf and @@ -34,7 +34,7 @@ index 5950215..a59d72f 100644 postfix_backup_multiple: true roles: - - postfix -+ - rhel-system-roles.postfix ++ - linux-system-roles.postfix ``` diff --git a/SOURCES/rhel-system-roles-selinux-prefix.diff b/SOURCES/rhel-system-roles-selinux-prefix.diff index b31d6c9..dd73ab8 100644 --- a/SOURCES/rhel-system-roles-selinux-prefix.diff +++ b/SOURCES/rhel-system-roles-selinux-prefix.diff @@ -7,7 +7,7 @@ index 80bcf89..cf8cb1b 100644 [ see bellow ] roles: - - role: selinux -+ - role: rhel-system-roles.selinux ++ - role: linux-system-roles.selinux become: true ``` @@ -20,4 +20,4 @@ index 28e072c..a5dad27 100644 roles: - - selinux -+ - rhel-system-roles.selinux ++ - linux-system-roles.selinux diff --git a/SOURCES/rhel-system-roles-timesync-prefix.diff b/SOURCES/rhel-system-roles-timesync-prefix.diff index e030816..58516d1 100644 --- a/SOURCES/rhel-system-roles-timesync-prefix.diff +++ b/SOURCES/rhel-system-roles-timesync-prefix.diff @@ -7,7 +7,7 @@ index f419e0b..0d2112d 100644 iburst: yes roles: - - timesync -+ - rhel-system-roles.timesync ++ - linux-system-roles.timesync ``` Install and configure linuxptp to synchronize the system clock with a @@ -16,7 +16,7 @@ index f419e0b..0d2112d 100644 interfaces: [ eth0 ] roles: - - timesync -+ - rhel-system-roles.timesync ++ - linux-system-roles.timesync ``` Install and configure chrony and linuxptp to synchronize the system clock with @@ -25,5 +25,5 @@ index f419e0b..0d2112d 100644 delay: 0.000010 roles: - - timesync -+ - rhel-system-roles.timesync ++ - linux-system-roles.timesync ``` diff --git a/SOURCES/timesync-playbook.yml b/SOURCES/timesync-playbook.yml index 771f91a..1b1b081 100644 --- a/SOURCES/timesync-playbook.yml +++ b/SOURCES/timesync-playbook.yml @@ -11,4 +11,4 @@ - hostname: 3.rhel.pool.ntp.org iburst: yes roles: - - rhel-system-roles.timesync + - linux-system-roles.timesync diff --git a/SOURCES/timesync-pool-playbook.yml b/SOURCES/timesync-pool-playbook.yml index ebfb0b9..f186a53 100644 --- a/SOURCES/timesync-pool-playbook.yml +++ b/SOURCES/timesync-pool-playbook.yml @@ -6,4 +6,4 @@ pool: yes iburst: yes roles: - - rhel-system-roles.timesync + - linux-system-roles.timesync diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index 5b2770a..76fcd69 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -1,12 +1,12 @@ Name: rhel-system-roles Summary: Set of interfaces for unified system management -Version: 0.2 -Release: 2%{?dist} +Version: 0.4 +Release: 1%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD -%global roleauthor rhel-system-roles -%global roleprefix %{roleauthor}. +%global rolecompatprefix rhel-system-roles. +%global roleprefix linux-system-roles. %global commit0 fe8bb81966b60fa8979f3816a12b0c7120d71140 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) @@ -28,17 +28,18 @@ License: GPLv3+ and MIT and BSD %global rolename3 timesync %global version3 0.1 -%global commit5 03ff040df78a14409a0d89eba1235b8f3e50a750 +%global commit5 b9b6f0a7969e400d8d6ba0ac97f69593aa1e8fa5 %global shortcommit5 %(c=%{commit5}; echo ${c:0:7}) %global rolename5 network -%global version5 0.2 +#%%global version5 0.2 Source: https://github.com/linux-system-roles/%{rolename0}/archive/%{version0}.tar.gz#/%{rolename0}-%{version0}.tar.gz Source1: https://github.com/linux-system-roles/%{rolename1}/archive/%{version1}.tar.gz#/%{rolename1}-%{version1}.tar.gz Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{version2}.tar.gz#/%{rolename2}-%{version2}.tar.gz Source3: https://github.com/linux-system-roles/%{rolename3}/archive/%{version3}.tar.gz#/%{rolename3}-%{version3}.tar.gz -Source5: https://github.com/linux-system-roles/%{rolename5}/archive/%{version5}.tar.gz#/%{rolename5}-%{version5}.tar.gz +Source5: https://github.com/linux-system-roles/%{rolename5}/archive/%{commit5}.tar.gz#/%{rolename5}-%{shortcommit5}.tar.gz + Source6: timesync-playbook.yml Source7: timesync-pool-playbook.yml @@ -47,7 +48,7 @@ Patch2: rhel-system-roles-%{rolename2}-prefix.diff Patch3: rhel-system-roles-%{rolename3}-prefix.diff Patch5: rhel-system-roles-%{rolename5}-prefix.diff -Patch6: rhel-system-roles-network-rfc7042.diff +Patch21: fix-selinux-disabled-pr2.diff Url: https://github.com/linux-system-roles/ BuildArch: noarch @@ -67,13 +68,13 @@ cd %{rolename1}-%{version1} cd .. cd %{rolename2}-%{version2} %patch2 -p1 +%patch21 -p1 cd .. cd %{rolename3}-%{version3} %patch3 -p1 cd .. -cd %{rolename5}-%{version5} +cd %{rolename5}-%{commit5} %patch5 -p1 -%patch6 -p1 cd .. %build @@ -81,11 +82,17 @@ cd .. %install mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles -cp -pR %{rolename0}-%{version0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename0} -cp -pR %{rolename1}-%{version1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename1} -cp -pR %{rolename2}-%{version2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2} -cp -pR %{rolename3}-%{version3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3} -cp -pR %{rolename5}-%{version5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5} +cp -pR %{rolename0}-%{version0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename0} +cp -pR %{rolename1}-%{version1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename1} +cp -pR %{rolename2}-%{version2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename2} +cp -pR %{rolename3}-%{version3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename3} +cp -pR %{rolename5}-%{commit5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}%{rolename5} + +ln -s %{rolecompatprefix}%{rolename0} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename0} +ln -s %{rolecompatprefix}%{rolename1} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename1} +ln -s %{rolecompatprefix}%{rolename2} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename2} +ln -s %{rolecompatprefix}%{rolename3} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename3} +ln -s %{rolecompatprefix}%{rolename5} $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}%{rolename5} mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/kdump mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/postfix @@ -95,43 +102,45 @@ install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-times install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-timesync-pool-playbook.yml mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/network -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}kdump/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}kdump/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}kdump/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/kdump -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}postfix/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}postfix/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}postfix/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}postfix/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/postfix -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}selinux/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}selinux/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/selinux -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/selinux-playbook.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}selinux/selinux-playbook.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/selinux/example-selinux-playbook.yml -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}timesync/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}timesync/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/timesync -cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/README.md \ - $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/COPYING \ +cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/README.md \ + $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/network -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/bond-with-vlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/bond-with-vlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-bond-with-vlan-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/bridge-with-vlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/bridge-with-vlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-bridge-with-vlan-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/eth-simple-auto.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/eth-simple-auto.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-eth-simple-auto-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/eth-with-vlan.yml \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/eth-with-vlan.yml \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-eth-with-vlan-playbook.yml -mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/inventory \ +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/infiniband.yml \ + $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-infiniband-playbook.yml +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/inventory \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-inventory -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/.gitignore -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/test/.gitignore -rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/roles/network -rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/roles -rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/.gitignore +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/test/.gitignore +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/roles/network +rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples/roles +rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/examples %files %{_datadir}/ansible/roles/%{roleprefix}kdump @@ -139,24 +148,46 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples %{_datadir}/ansible/roles/%{roleprefix}selinux %{_datadir}/ansible/roles/%{roleprefix}timesync %{_datadir}/ansible/roles/%{roleprefix}network +%{_datadir}/ansible/roles/%{rolecompatprefix}kdump +%{_datadir}/ansible/roles/%{rolecompatprefix}postfix +%{_datadir}/ansible/roles/%{rolecompatprefix}selinux +%{_datadir}/ansible/roles/%{rolecompatprefix}timesync +%{_datadir}/ansible/roles/%{rolecompatprefix}network %doc %{_pkgdocdir}/*/example-*-playbook.yml %doc %{_pkgdocdir}/network/example-inventory %doc %{_pkgdocdir}/*/README.md -%doc %{_datadir}/ansible/roles/%{roleprefix}kdump/README.md -%doc %{_datadir}/ansible/roles/%{roleprefix}postfix/README.md -%doc %{_datadir}/ansible/roles/%{roleprefix}selinux/README.md -%doc %{_datadir}/ansible/roles/%{roleprefix}timesync/README.md -%doc %{_datadir}/ansible/roles/%{roleprefix}network/README.md +%doc %{_datadir}/ansible/roles/%{rolecompatprefix}kdump/README.md +%doc %{_datadir}/ansible/roles/%{rolecompatprefix}postfix/README.md +%doc %{_datadir}/ansible/roles/%{rolecompatprefix}selinux/README.md +%doc %{_datadir}/ansible/roles/%{rolecompatprefix}timesync/README.md +%doc %{_datadir}/ansible/roles/%{rolecompatprefix}network/README.md %license %{_pkgdocdir}/*/COPYING -%license %{_datadir}/ansible/roles/%{roleprefix}kdump/COPYING -%license %{_datadir}/ansible/roles/%{roleprefix}postfix/COPYING -%license %{_datadir}/ansible/roles/%{roleprefix}selinux/COPYING -%license %{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING -%license %{_datadir}/ansible/roles/%{roleprefix}network/COPYING +%license %{_datadir}/ansible/roles/%{rolecompatprefix}kdump/COPYING +%license %{_datadir}/ansible/roles/%{rolecompatprefix}postfix/COPYING +%license %{_datadir}/ansible/roles/%{rolecompatprefix}selinux/COPYING +%license %{_datadir}/ansible/roles/%{rolecompatprefix}timesync/COPYING +%license %{_datadir}/ansible/roles/%{rolecompatprefix}network/COPYING %changelog +* Mon Aug 28 2017 Pavel Cahyna - 0.4-1 +- network: update to b9b6f0a7969e400d8d6ba0ac97f69593aa1e8fa5: + ensure that state:absent followed by state:up works (bz#1478910), and change + the example IP adresses to the IANA-assigned ones. +- SELinux: fix the case when SELinux is disabled (bz#1479546). + +* Tue Aug 8 2017 Pavel Cahyna - 0.3-2 +- We can't change directories to symlinks (rpm bug #447156) so keep the old + names and create the new names as symlinks. + +* Tue Aug 8 2017 Pavel Cahyna - 0.3-1 +- Change the prefix to linux-system-roles., keeping compatibility + symlinks. +- Update the network role to dace7654feb7b5629ded0734c598e087c2713265: + adds InfiniBand support and other fixes. +- Drop a patch included upstream. + * Mon Jun 26 2017 Pavel Cahyna - 0.2-2 - Leave a copy of README and COPYING in every role's directory, as suggested by T. Bowling. - Move the network example inventory to the documentation directory together.