From 93ba66e47109424928d18604ce49928038203d67 Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Tue, 16 Aug 2022 17:18:50 +0200 Subject: [PATCH] Fix lint errors --- tasks/main.yml | 12 ++++++------ vars/RedHat.yml | 2 +- vars/main.yml | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 vars/main.yml diff --git a/tasks/main.yml b/tasks/main.yml index 6bf0dd0..acb512d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -68,7 +68,7 @@ ansible.builtin.command: cmd: dnf -y copr enable rhcontainerbot/container-selinux creates: /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:rhcontainerbot:container-selinux.repo - warn: no + warn: false - name: Install container-selinux GPG key ansible.builtin.rpm_key: key: "https://download.copr.fedorainfracloud.org/results/rhcontainerbot/container-selinux/pubkey.gpg" @@ -76,26 +76,26 @@ - name: Registering libcontainers repository ansible.builtin.get_url: - url: https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_{{ ansible_distribution_major_version }}/devel:kubic:libcontainers:stable.repo + url: "{{ crio_base_url }}/stable/CentOS_{{ ansible_distribution_major_version }}/devel:kubic:libcontainers:stable.repo" dest: /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo owner: root group: root mode: 0644 - name: Install libcontainers GPG key ansible.builtin.rpm_key: - key: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key" + key: "{{ crio_base_url }}/stable/CentOS_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key" state: present - name: Registering CRI-O {{ crio_version }} repository ansible.builtin.get_url: - url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_{{ ansible_distribution_major_version }}/devel:kubic:libcontainers:stable:cri-o:{{ crio_version }}.repo" + url: "{{ crio_base_url }}/stable:/cri-o:/{{ crio_version }}/CentOS_{{ ansible_distribution_major_version }}/devel:kubic:libcontainers:stable:cri-o:{{ crio_version }}.repo" dest: "/etc/yum.repos.d/devel:kubic:libcontainers:stable:cri-o:{{ crio_version }}.repo" owner: root group: root mode: 0644 - name: Install CRI-O GPG key ansible.builtin.rpm_key: - key: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/{{ crio_version }}/CentOS_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key" + key: "{{ crio_base_url }}/stable:/cri-o:/{{ crio_version }}/CentOS_{{ ansible_distribution_major_version }}/repodata/repomd.xml.key" state: present - name: Update package manager list @@ -138,4 +138,4 @@ enabled: true tags: - - crio \ No newline at end of file + - crio diff --git a/vars/RedHat.yml b/vars/RedHat.yml index bd2b2be..90914e8 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,3 +1,3 @@ --- -crio_package_name: +crio_package_name: - cri-o diff --git a/vars/main.yml b/vars/main.yml new file mode 100644 index 0000000..c88eec4 --- /dev/null +++ b/vars/main.yml @@ -0,0 +1,2 @@ +--- +crio_base_url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:"