From 5907acf7093ed3c64b418590287db8446f9bac21 Mon Sep 17 00:00:00 2001 From: Jan Benedikt Date: Fri, 25 Oct 2019 03:35:51 -0400 Subject: Chaging name of rhel resource directory to rpm Changing name of rhel resource directory in "resources/pkg" from rhel to rpm due to platfrom independent repository for all distributions supporting RPM packages. Issue-ID: OOM-2150 Change-Id: Ie5425df8b8550c618440586b495907f86c4cc509 Signed-off-by: Jan Benedikt --- ansible/test/roles/prepare-package-repository/tasks/main.yml | 10 +++++----- ansible/test/roles/prepare-package-repository/vars/main.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ansible/test/roles') diff --git a/ansible/test/roles/prepare-package-repository/tasks/main.yml b/ansible/test/roles/prepare-package-repository/tasks/main.yml index 66f81d6d..983e9766 100644 --- a/ansible/test/roles/prepare-package-repository/tasks/main.yml +++ b/ansible/test/roles/prepare-package-repository/tasks/main.yml @@ -12,15 +12,15 @@ name: createrepo state: present -- name: "Ensure {{ rhel_pkg_dir }} exists" +- name: "Ensure {{ pkg_dir }} exists" file: - path: "{{ rhel_pkg_dir }}" + path: "{{ pkg_dir }}" state: directory - name: Download rpm packages - command: "yumdownloader --destdir={{ rhel_pkg_dir }} --resolve {{ packages | join(' ') }}" + command: "yumdownloader --destdir={{ pkg_dir }} --resolve {{ packages | join(' ') }}" - name: Index repository - command: "createrepo {{ rhel_pkg_dir }}" + command: "createrepo {{ pkg_dir }}" args: - creates: "{{ rhel_pkg_dir }}/repodata" + creates: "{{ pkg_dir }}/repodata" diff --git a/ansible/test/roles/prepare-package-repository/vars/main.yml b/ansible/test/roles/prepare-package-repository/vars/main.yml index 80944284..195ad0f1 100644 --- a/ansible/test/roles/prepare-package-repository/vars/main.yml +++ b/ansible/test/roles/prepare-package-repository/vars/main.yml @@ -1,5 +1,5 @@ --- -rhel_pkg_dir: "{{ app_data_path }}/pkg/rhel" +pkg_dir: "{{ app_data_path }}/pkg/rpm" packages: - "docker-ce-18.09.5" - container-selinux -- cgit