From e3da41c166a80f8ee5144099655ceca884c1d172 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 16:53:34 +0000 Subject: import rhel-system-roles-1.0-8.el7 --- diff --git a/.gitignore b/.gitignore index 1948548..3e1ea12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/kdump-4b40b01.tar.gz -SOURCES/network-64b2d76.tar.gz +SOURCES/kdump-0c2bb28.tar.gz +SOURCES/network-8ec0196.tar.gz SOURCES/postfix-0.1.tar.gz -SOURCES/selinux-1.0.0.tar.gz -SOURCES/timesync-1.0.0.tar.gz +SOURCES/selinux-6cd1ec8.tar.gz +SOURCES/timesync-85b90fe.tar.gz diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata index 9f67635..9c246b1 100644 --- a/.rhel-system-roles.metadata +++ b/.rhel-system-roles.metadata @@ -1,5 +1,5 @@ -0d49f208eb69b9266de9bd4505cfe5858af0f54a SOURCES/kdump-4b40b01.tar.gz -7199b5d21ccced62f4cc754f536bedcf68b3ad86 SOURCES/network-64b2d76.tar.gz +36b200d1c6a8d1cb1ea87e3e9aa8c4f6bbd8155d SOURCES/kdump-0c2bb28.tar.gz +d4d67376d419286b62dbdcd80c1afccbab5e75af SOURCES/network-8ec0196.tar.gz 66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz -ad58a43c113551559d1a5bab9f9c6c99f923f7c3 SOURCES/selinux-1.0.0.tar.gz -7e6559e43aa58796a67b6341abe484e3cbc3db27 SOURCES/timesync-1.0.0.tar.gz +246383bd6823533ed3a51a0501b75e38ba852908 SOURCES/selinux-6cd1ec8.tar.gz +f660bba90dcd41a33c5aaa5286533ba6365660eb SOURCES/timesync-85b90fe.tar.gz diff --git a/SOURCES/rhel-system-roles-kdump-pr22.diff b/SOURCES/rhel-system-roles-kdump-pr22.diff new file mode 100644 index 0000000..d7d2796 --- /dev/null +++ b/SOURCES/rhel-system-roles-kdump-pr22.diff @@ -0,0 +1,80 @@ +diff --git a/tasks/ssh.yml b/tasks/ssh.yml +index 1a4e858..b05d01a 100644 +--- a/tasks/ssh.yml ++++ b/tasks/ssh.yml +@@ -18,3 +18,15 @@ + key: "{{ keydata.content|b64decode }}" + state: present + delegate_to: "{{ kdump_ssh_server }}" ++ ++- name: Fetch the servers public key ++ slurp: ++ src: /etc/ssh/ssh_host_rsa_key.pub ++ register: serverpubkey ++ delegate_to: "{{ kdump_ssh_server }}" ++ ++- name: Add the servers public key to known_hosts on managed node ++ known_hosts: ++ key: "{{ kdump_ssh_server_location }} {{ serverpubkey.content | b64decode }}" ++ name: "{{ kdump_ssh_server_location }}" ++ path: /etc/ssh/ssh_known_hosts +diff --git a/templates/kdump.conf.j2 b/templates/kdump.conf.j2 +index bf24210..504ff34 100644 +--- a/templates/kdump.conf.j2 ++++ b/templates/kdump.conf.j2 +@@ -1,12 +1,17 @@ + # {{ ansible_managed }} + + {% if kdump_target %} +-{{ kdump_target.type }} {{ kdump_target.location }} +-{% endif %} ++{% if kdump_target.type == "ssh" %} ++ssh {{ kdump_target.location | d(kdump_ssh_user ~ '@' ~ kdump_ssh_server) }} + +-{% if kdump_target and kdump_target.type == "ssh" and kdump_sshkey != '/root/.ssh/kdump_id_rsa' %} ++{% if kdump_sshkey != '/root/.ssh/kdump_id_rsa' %} + sshkey {{ kdump_sshkey }} + {% endif %} ++{% else %} ++{{ kdump_target.type }} {{ kdump_target.location }} ++ ++{% endif %} ++{% endif %} + + path {{ kdump_path }} + {% if kdump_core_collector %} +diff --git a/tests/tests_ssh.yml b/tests/tests_ssh.yml +index 679148e..14a59d9 100644 +--- a/tests/tests_ssh.yml ++++ b/tests/tests_ssh.yml +@@ -6,6 +6,11 @@ + # known and ansible is supposed to be configured to be able to + # connect to it (via inventory). + kdump_ssh_server_outside: localhost ++ kdump_ssh_source: "{{ ansible_env['SSH_CONNECTION'].split()[0] }}" ++ ++ # this is the address at which the ssh dump server can be reached ++ # from the managed host. Dumps will be uploaded there. ++ kdump_ssh_server_inside: "{{ kdump_ssh_source if kdump_ssh_source in hostvars[kdump_ssh_server_outside]['ansible_all_ipv4_addresses'] + hostvars[kdump_ssh_server_outside]['ansible_all_ipv6_addresses'] else hostvars[kdump_ssh_server_outside]['ansible_default_ipv4']['address'] }}" + + tasks: + - name: gather facts from {{ kdump_ssh_server_outside }} +@@ -25,8 +30,5 @@ + type: ssh + # This is the ssh dump server address visible from inside + # the machine being configured. Dumps are to be copied +- # there. We make here the assumption that this machine is +- # being run as a VM and the dump server is the VM host +- # (i.e. for ansible this is localhost). From the VM its +- # address is then identical to the default route. +- location: "{{ kdump_ssh_user }}@{{ ansible_default_ipv4.gateway }}" ++ # there. ++ location: "{{ kdump_ssh_user }}@{{ kdump_ssh_server_inside }}" +diff --git a/vars/main.yml b/vars/main.yml +new file mode 100644 +index 0000000..34d2d62 +--- /dev/null ++++ b/vars/main.yml +@@ -0,0 +1,2 @@ ++# determine the managed node facing ssh server address ++kdump_ssh_server_location: "{{ kdump_target.location | regex_replace('.*@(.*)$', '\\1') if kdump_target.location is defined else kdump_ssh_server }}" diff --git a/SOURCES/rhel-system-roles-selinux-prefix.diff b/SOURCES/rhel-system-roles-selinux-prefix.diff index 8820d6d..7e80daa 100644 --- a/SOURCES/rhel-system-roles-selinux-prefix.diff +++ b/SOURCES/rhel-system-roles-selinux-prefix.diff @@ -2,7 +2,7 @@ diff --git a/README.md b/README.md index a0385b0..6efc62d 100644 --- a/README.md +++ b/README.md -@@ -41,7 +41,7 @@ This role can be configured using variables as it is described below. +@@ -42,7 +42,7 @@ This role can be configured using variab vars: [ see below ] roles: diff --git a/SOURCES/rhel-system-roles-timesync-prefix.diff b/SOURCES/rhel-system-roles-timesync-prefix.diff index e985a80..6fe1889 100644 --- a/SOURCES/rhel-system-roles-timesync-prefix.diff +++ b/SOURCES/rhel-system-roles-timesync-prefix.diff @@ -1,28 +1,46 @@ diff -up timesync-1.0.0/README.md.orig timesync-1.0.0/README.md --- timesync-1.0.0/README.md.orig 2018-08-21 11:46:41.000000000 +0200 +++ timesync-1.0.0/README.md 2018-11-06 22:29:14.586770442 +0100 -@@ -81,7 +81,7 @@ Install and configure ntp to synchronize +@@ -82,7 +82,7 @@ Install and configure ntp to synchronize - hostname: baz.example.com iburst: yes roles: -- - timesync +- - linux-system-roles.timesync + - rhel-system-roles.timesync ``` Install and configure linuxptp to synchronize the system clock with a -@@ -94,7 +94,7 @@ grandmaster in PTP domain number 0, whic +@@ -95,7 +95,7 @@ grandmaster in PTP domain number 0, whic - number: 0 interfaces: [ eth0 ] roles: -- - timesync +- - linux-system-roles.timesync + - rhel-system-roles.timesync ``` Install and configure chrony and linuxptp to synchronize the system clock with -@@ -121,5 +121,5 @@ synchronization: +@@ -122,5 +122,5 @@ synchronization: transport: UDPv4 delay: 0.000010 roles: -- - timesync +- - linux-system-roles.timesync + - rhel-system-roles.timesync ``` +diff -up timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/multiple-ntp-servers.yml.orig timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/multiple-ntp-servers.yml +--- timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/multiple-ntp-servers.yml.orig 2019-06-03 18:03:18.081868584 +0200 ++++ timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/multiple-ntp-servers.yml 2019-06-03 18:03:26.718704991 +0200 +@@ -11,4 +11,4 @@ + - hostname: 3.pool.ntp.org + iburst: yes + roles: +- - linux-system-roles.timesync ++ - rhel-system-roles.timesync +diff -up timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/single-pool.yml.orig timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/single-pool.yml +--- timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/single-pool.yml.orig 2019-06-03 16:36:40.000000000 +0200 ++++ timesync-85b90feedee2a5b3148fd3f72b229b44ec597682/examples/single-pool.yml 2019-06-03 18:03:36.721515519 +0200 +@@ -6,4 +6,4 @@ + pool: yes + iburst: yes + roles: +- - linux-system-roles.timesync ++ - rhel-system-roles.timesync diff --git a/SOURCES/timesync-playbook.yml b/SOURCES/timesync-playbook.yml deleted file mode 100644 index 782ea91..0000000 --- a/SOURCES/timesync-playbook.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- hosts: targets - vars: - timesync_ntp_servers: - - hostname: 0.rhel.pool.ntp.org - iburst: yes - - hostname: 1.rhel.pool.ntp.org - iburst: yes - - hostname: 2.rhel.pool.ntp.org - iburst: yes - - hostname: 3.rhel.pool.ntp.org - iburst: yes - roles: - - rhel-system-roles.timesync diff --git a/SOURCES/timesync-pool-playbook.yml b/SOURCES/timesync-pool-playbook.yml deleted file mode 100644 index ed07d4b..0000000 --- a/SOURCES/timesync-pool-playbook.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- hosts: targets - vars: - timesync_ntp_servers: - - hostname: 2.rhel.pool.ntp.org - pool: yes - iburst: yes - roles: - - rhel-system-roles.timesync diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec index 10ac280..577bd78 100644 --- a/SPECS/rhel-system-roles.spec +++ b/SPECS/rhel-system-roles.spec @@ -5,7 +5,7 @@ Name: linux-system-roles %endif Summary: Set of interfaces for unified system management Version: 1.0 -Release: 5%{?dist} +Release: 8%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD @@ -26,7 +26,7 @@ License: GPLv3+ and MIT and BSD %%global shortid%{1} %{2} } -%defcommit 0 4b40b01079e82b1c5f948ae87d81a135069747cc +%defcommit 0 0c2bb286bbc1b73d728226924e0010c0fa1ce30a %global rolename0 kdump #%%deftag 0 1.0.0 @@ -34,15 +34,15 @@ License: GPLv3+ and MIT and BSD %global rolename1 postfix %deftag 1 0.1 -#%%defcommit 2 6dd057aa434a31cb6ee67d02967362f9131e0c50 +%defcommit 2 6cd1ec8fdebdb92a789b14e5a44fe77f0a3d8ecd %global rolename2 selinux -%deftag 2 1.0.0 +#%%deftag 2 1.0.0 -#%%defcommit 3 33a1a8c349de10d6281ed83d4c791e9177d7a141 +%defcommit 3 85b90feedee2a5b3148fd3f72b229b44ec597682 %global rolename3 timesync -%deftag 3 1.0.0 +#%%deftag 3 1.0.0 -%defcommit 5 64b2d76de74df2d480394d02aae204beda4d9257 +%defcommit 5 8ec01967813a3db0dc446c63cde7ba26c5ab53db %global rolename5 network #%%deftag 5 1.0.0 @@ -52,9 +52,6 @@ Source2: https://github.com/linux-system-roles/%{rolename2}/archive/%{id2}.tar.g 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 -Source6: timesync-playbook.yml -Source7: timesync-pool-playbook.yml - %if "%{roleprefix}" != "linux-system-roles." Patch1: rhel-system-roles-%{rolename1}-prefix.diff Patch2: rhel-system-roles-%{rolename2}-prefix.diff @@ -63,6 +60,7 @@ Patch5: rhel-system-roles-%{rolename5}-prefix.diff %endif Patch11: rhel-system-roles-postfix-pr5.diff +Patch101: rhel-system-roles-kdump-pr22.diff Url: https://github.com/linux-system-roles/ BuildArch: noarch @@ -86,7 +84,7 @@ of Fedora, Red Hat Enterprise Linux & CentOS. %prep %setup -qc -a1 -a2 -a3 -a5 cd %{rolename0}-%{id0} -#kdump patches here if necessary +%patch101 -p1 cd .. cd %{rolename1}-%{id1} %if "%{roleprefix}" != "linux-system-roles." @@ -133,8 +131,6 @@ mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/kdump mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/postfix mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/selinux mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/timesync -install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-timesync-playbook.yml -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 \ @@ -154,6 +150,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}selinux/selinux-playboo cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/README.md \ $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/COPYING \ $RPM_BUILD_ROOT%{_pkgdocdir}/timesync +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/examples/multiple-ntp-servers.yml \ + $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-timesync-playbook.yml +mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}timesync/examples/single-pool.yml \ + $RPM_BUILD_ROOT%{_pkgdocdir}/timesync/example-timesync-pool-playbook.yml cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/README.md \ $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/LICENSE \ @@ -179,6 +179,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/down-p mv $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/inventory \ $RPM_BUILD_ROOT%{_pkgdocdir}/network/example-inventory +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/semaphore +rm -r $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/molecule +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/.travis.yml +rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}*/.ansible-lint + rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/.gitignore rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/tests/.gitignore rm $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples/roles @@ -218,6 +223,21 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}network/examples %license %{_datadir}/ansible/roles/%{roleprefix}network/LICENSE %changelog +* Mon Jun 3 2019 Pavel Cahyna - 1.0-8 +- Rebase the selinux role, fixes typo in tests, uncovered by Ansible 2.7, + (rhbz#1651285) and lists all input variables of the selinux role in defaults + to make Satellite aware of them (rhbz#1674000, PR#43) +- Rebase the kdump role to fix check mode problems: rhbz#1716689 +- Rebase the timesync role: fixes check mode problems (rhbz#1716689) + and lists all input variables in defaults (rhbz#1674000) +- Rebase the network role: keeps the interface up for state: up + if persistent_state is absent and solves problems with defining + VLAN and MACVLAN interface types (issue #19) (rhbz#1686866) + +* Mon May 13 2019 Pavel Cahyna - 1.0-7 +- kdump: copy the dump target's public host key to the managed node known_hosts + PR #22, rhbz#1651342 + * Tue Nov 6 2018 Pavel Cahyna - 1.0-5 - spec file improvement: Unify the source macros with deftag() and defcommit() - Update to upstream released versions and drop unnecessary patches.