From 8a59404c26c6249379eb3756040c67e66441c7c5 Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Mon, 24 Jan 2022 07:09:28 +0100 Subject: [PATCH] Switch to RockyLinux NFV repository --- .../pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV | 20 ----------- .../etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial | 29 ++++++++++++++++ .../RockyLinux-NFV-OpenvSwitch.repo | 33 +++---------------- tasks/RedHat.yml | 24 +++++++------- tasks/main.yml | 2 ++ 5 files changed, 49 insertions(+), 59 deletions(-) delete mode 100644 files/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV create mode 100644 files/etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial diff --git a/files/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV b/files/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV deleted file mode 100644 index 23f8d49..0000000 --- a/files/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -mQENBFqMVyYBCACriP6iaXy1GtYgrueyz3U+GmNvNrnugEUAeWicotKvmlqjUKqs -s5N+Zr9yjAuwPjruywNVxuhRxTdyvU0PMMh7ZMkeWtJ26GWuCmN9Wf3rU5I2Eljh -nzulf06q8E1zYLtggHfk6FOP+lYloCOPZys6BCxeWA8MvRfhbspI0pIhnnIFwHYe -71K/ljyfoAsth/WC5kZnqj0LpJRVmp2kooS79LSC1DXTATaaU0RCSY5xINMTjrmD -6yA6GwRoAUu3y1IF02jI2Q3NoOht7GtYXDuAr+MaRJBI1oXr2uAbu4Frvcx3zHAy -CRbngZNnbh/kssAvAoEHev/qkhVhvbIwVuizABEBAAG0V0NlbnRPUyBORlYgU0lH -IChodHRwczovL3dpa2kuY2VudG9zLm9yZy9TcGVjaWFsSW50ZXJlc3RHcm91cC9O -RlYpIDxzZWN1cml0eUBjZW50b3Mub3JnPokBOQQTAQIAIwUCWoxXJgIbAwcLCQgH -AwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJECFGXiidKnanhrwH/2FOV18yEFpIIps9 -4GoAaLNtxdLEPbgLuKdu01x1ate2pv3yPQoewmI/AdxBItIA0uqeMX/XPGdBwvAD -1lPqpOtDBlaay12EeOTyhxKdTQdkW3Sb1Yhoj01qfNEEm3kaOiHDvIZHqxmj4OfP -K20hhI0pw2qm2JMsRtuLBgHo+rUP7gOHy7jbA1kvTc0lkpcQzTKgXM13L1l7tKXm -U8P7FKRKKG49IFQXtsbx1lW/vr2phzKVL93xQKeqEy5PauvZr+rIl8LNSVdoBEHc -y6f4nNlCyG0G2ZTe68vf4D9cFtITB/ZR6+/hp+2VT7ivT/hj+8721G900P3KjgA+ -+TXPsDw= -=B5Lp ------END PGP PUBLIC KEY BLOCK----- diff --git a/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial b/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial new file mode 100644 index 0000000..28ce769 --- /dev/null +++ b/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGAofzYBEAC6yS1azw6f3wmaVd//3aSy6O2c9+jeetulRQvg2LvhRRS1eNqp +/x9tbBhfohu/tlDkGpYHV7diePgMml9SZDy1sKlI3tDhx6GZ3xwF0fd1vWBZpmNk +D9gRkUmYBeLotmcXQZ8ZpWLicosFtDpJEYpLUhuIgTKwt4gxJrHvkWsGQiBkJxKD +u3/RlL4IYA3Ot9iuCBflc91EyAw1Yj0gKcDzbOqjvlGtS3ASXgxPqSfU0uLC9USF +uKDnP2tcnlKKGfj0u6VkqISliSuRAzjlKho9Meond+mMIFOTT6qp4xyu+9Dj3IjZ +IC6rBXRU3xi8z0qYptoFZ6hx70NV5u+0XUzDMXdjQ5S859RYJKijiwmfMC7gZQAf +OkdOcicNzen/TwD/slhiCDssHBNEe86Wwu5kmDoCri7GJlYOlWU42Xi0o1JkVltN +D8ZId+EBDIms7ugSwGOVSxyZs43q2IAfFYCRtyKHFlgHBRe9/KTWPUrnsfKxGJgC +Do3Yb63/IYTvfTJptVfhQtL1AhEAeF1I+buVoJRmBEyYKD9BdU4xQN39VrZKziO3 +hDIGng/eK6PaPhUdq6XqvmnsZ2h+KVbyoj4cTo2gKCB2XA7O2HLQsuGduHzYKNjf +QR9j0djjwTrsvGvzfEzchP19723vYf7GdcLvqtPqzpxSX2FNARpCGXBw9wARAQAB +tDNSZWxlYXNlIEVuZ2luZWVyaW5nIDxpbmZyYXN0cnVjdHVyZUByb2NreWxpbnV4 +Lm9yZz6JAk4EEwEIADgWIQRwUcRwqSn0VM6+N7cVr12sbXRaYAUCYCh/NgIbDwUL +CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAVr12sbXRaYLFmEACSMvoO1FDdyAbu +1m6xEzDhs7FgnZeQNzLZECv2j+ggFSJXezlNVOZ5I1I8umBan2ywfKQD8M+IjmrW +k9/7h9i54t8RS/RN7KNo7ECGnKXqXDPzBBTs1Gwo1WzltAoaDKUfXqQ4oJ4aCP/q +/XPVWEzgpJO1XEezvCq8VXisutyDiXEjjMIeBczxb1hbamQX+jLTIQ1MDJ4Zo1YP +zlUqrHW434XC2b1/WbSaylq8Wk9cksca5J+g3FqTlgiWozyy0uxygIRjb6iTzKXk +V7SYxeXp3hNTuoUgiFkjh5/0yKWCwx7aQqlHar9GjpxmBDAO0kzOlgtTw//EqTwR +KnYZLig9FW0PhwvZJUigr0cvs/XXTTb77z/i/dfHkrjVTTYenNyXogPtTtSyxqca +61fbPf0B/S3N43PW8URXBRS0sykpX4SxKu+PwKCqf+OJ7hMEVAapqzTt1q9T7zyB +QwvCVx8s7WWvXbs2d6ZUrArklgjHoHQcdxJKdhuRmD34AuXWCLW+gH8rJWZpuNl3 ++WsPZX4PvjKDgMw6YMcV7zhWX6c0SevKtzt7WP3XoKDuPhK1PMGJQqQ7spegGB+5 +DZvsJS48Ip0S45Qfmj82ibXaCBJHTNZE8Zs+rdTjQ9DS5qvzRA1sRA1dBb/7OLYE +JmeWf4VZyebm+gc50szsg6Ut2yT8hw== +=AiP8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/files/etc/yum.repos.d/RockyLinux-NFV-OpenvSwitch.repo b/files/etc/yum.repos.d/RockyLinux-NFV-OpenvSwitch.repo index 227236d..54750f8 100644 --- a/files/etc/yum.repos.d/RockyLinux-NFV-OpenvSwitch.repo +++ b/files/etc/yum.repos.d/RockyLinux-NFV-OpenvSwitch.repo @@ -1,36 +1,13 @@ -# CentOS-NFV-OpenvSwitch.repo +# RockyLinux-NFV-OpenvSwitch.repo # # Please see http://wiki.centos.org/SpecialInterestGroup/NFV for more # information -[centos-nfv-openvswitch] -name=CentOS-$releasever - NFV OpenvSwitch -baseurl=http://mirror.centos.org/centos/$releasever/nfv/$basearch/openvswitch-2/ -#mirrorlist=http://mirrorlist.centos.org/?release=$nfvsigdist&arch=$basearch&repo=nfv-openvswitch-2 +[rockylinux-nfv-openvswitch] +name=Rocky Linux NFV 8 - OpenvSwitch +baseurl=https://download.rockylinux.org/pub/rocky/8/nfv/$basearch/os/ gpgcheck=1 enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial module_hotfixes=1 -[centos-nfv-openvswitch-testing] -name=CentOS-$releasever - NFV OpenvSwitch Testing -baseurl=http://buildlogs.centos.org/centos/$nfvsigdist/nfv/$basearch/openvswitch-2/ -gpgcheck=0 -enabled=0 -module_hotfixes=1 - -[centos-nfv-openvswitch-debuginfo] -name=CentOS-$releasever - NFV OpenvSwitch - Debug -baseurl=http://debuginfo.centos.org/centos/$nfvsigdist/nfv/$basearch/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV -module_hotfixes=1 - -[centos-nfv-openvswitch-source] -name=CentOS-$releasever - NFV OpenvSwitch - Source -baseurl=http://vault.centos.org/centos/$releasever/nfv/Source/openvswitch-2/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV -module_hotfixes=1 diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index ed2bc9c..41b383a 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,5 +1,5 @@ --- -- name: Install CentOS NFV Openvswitch Repository +- name: Install RockyLinux NFV Openvswitch Repository copy: src: "{{ item }}" dest: "/{{ item }}" @@ -8,21 +8,22 @@ mode: 0644 with_items: - etc/yum.repos.d/RockyLinux-NFV-OpenvSwitch.repo - - etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV + - etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial when: - - ansible_distribution == "OracleLinux" +# - ansible_distribution == "OracleLinux" + - ansible_distribution != "CentOS" - name: Install CentOS NFV Openvswitch Repository RPM ansible.builtin.package: name: centos-release-nfv-openvswitch state: present when: - ansible_distribution == "CentOS" -- name: Enable a Fast Datapath RHSM repository - community.general.rhsm_repository: - name: "fast-datapath-for-rhel-8-{{ ansible_architecture }}-rpms" - when: - - ansible_distribution == "RedHat" - - ansible_distribution_major_version == '8' +#- name: Enable a Fast Datapath RHSM repository +# community.general.rhsm_repository: +# name: "fast-datapath-for-rhel-8-{{ ansible_architecture }}-rpms" +# when: +# - ansible_distribution == "RedHat" +# - ansible_distribution_major_version == '8' - name: Install OpenvSwitch ansible.builtin.package: name: @@ -31,7 +32,8 @@ - openvswitch-selinux-extra-policy - python3-openvswitch2.13 - NetworkManager-ovs +# - network-scripts-openvswitch2.13 state: present # update_cache: yes - when: - - (ansible_distribution == "OracleLinux") or (ansible_distribution == "CentOS") +# when: +# - (ansible_distribution == "OracleLinux") or (ansible_distribution == "CentOS") diff --git a/tasks/main.yml b/tasks/main.yml index 87e588e..96ae4fc 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -10,6 +10,8 @@ name: "{{ openvswitch_packages }}" state: present update_cache: yes + when: + ansible_os_family != "RedHat" notify: Restart openvswitch - name: Enable openvswitch