From b94355ee8b44473f1e633e9bf957c01aa9977994 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 8 Mar 2016 10:30:22 -0500 Subject: [PATCH] More consistent package name Change-Id: Ia33176acbaf6dca998e385ff75f263d27c0070c1 Signed-off-by: Paul Belanger --- tasks/install.yaml | 6 +++--- tasks/install/package.yaml | 2 +- vars/Debian.yaml | 2 +- vars/RedHat.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/install.yaml b/tasks/install.yaml index 2b57d5b..dcc8e3e 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -22,10 +22,10 @@ diskimage_builder_depends: "{{ __diskimage_builder_depends | list }}" when: diskimage_builder_depends is not defined -- name: Define diskimage_builder_pkg_name +- name: Define diskimage_builder_package_name set_fact: - diskimage_builder_pkg_name: "{{ __diskimage_builder_pkg_name }}" - when: diskimage_builder_pkg_name is not defined + diskimage_builder_package_name: "{{ __diskimage_builder_package_name }}" + when: diskimage_builder_package_name is not defined # NOTE(pabelanger): This needs to be here for now, since we need python-pip. - name: Ensure EPEL is enabled. diff --git a/tasks/install/package.yaml b/tasks/install/package.yaml index 4898e0a..eaecea5 100644 --- a/tasks/install/package.yaml +++ b/tasks/install/package.yaml @@ -14,5 +14,5 @@ --- - name: Install diskimage-builder from package. package: - name: "{{ diskimage_builder_pkg_name }}" + name: "{{ diskimage_builder_package_name }}" state: installed diff --git a/vars/Debian.yaml b/vars/Debian.yaml index 074e488..7619b12 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -22,4 +22,4 @@ __diskimage_builder_depends: - qemu-utils - uuid-runtime -__diskimage_builder_pkg_name: python-diskimage-builder +__diskimage_builder_package_name: python-diskimage-builder diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index b3d05ce..785bc83 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -21,4 +21,4 @@ __diskimage_builder_depends: - kpartx - qemu-img -__diskimage_builder_pkg_name: diskimage-builder +__diskimage_builder_package_name: diskimage-builder