windmill
/
ansible-role-diskimage-builder
Code Issues Proposed changes

Switch to package module 

This will help reduce duplicate code.

Change-Id: I165eda3c18fa5c1a824c66793e8f43b1586ef724
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-02-02 13:33:28 -05:00
parent 38be7a97ef
commit 1da2de56f0
3 changed files with 26 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tasks/install.yaml
View File

@ -27,11 +27,33 @@
diskimage_builder_pkg_name: "{{ __diskimage_builder_pkg_name }}"
when: diskimage_builder_pkg_name is not defined
- include: install/debian.yaml
when: ansible_os_family == 'Debian'
# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
- name: Ensure EPEL is enabled.
package:
pkg: epel-release
state: installed
when: (diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip') and
ansible_os_family == 'RedHat'
- include: install/redhat.yaml
when: ansible_os_family == 'RedHat'
- name: Ensure build dependencies are installed.
package:
name: "{{ item }}"
state: installed
with_items: diskimage_builder_build_depends
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Ensure dependencies are installed.
package:
pkg: "{{ item }}"
state: installed
with_items: diskimage_builder_depends
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Install diskimage-builder from OS package.
package:
pkg: "{{ diskimage_builder_pkg_name }}"
state: installed
when: diskimage_builder_install_method == 'pkg'
- include: install/git.yaml
when: diskimage_builder_install_method == 'git'

33
tasks/install/debian.yaml
View File

@ -1,33 +0,0 @@
# Copyright 2015 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
---
- name: Ensure build dependencies are installed.
apt:
pkg: "{{ item }}"
state: installed
with_items: diskimage_builder_build_depends
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Ensure dependencies are installed.
apt:
pkg: "{{ item }}"
state: installed
with_items: diskimage_builder_depends
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Install diskimage-builder using apt.
apt:
pkg: "{{ diskimage_builder_pkg_name }}"
state: installed
when: diskimage_builder_install_method == 'pkg'

40
tasks/install/redhat.yaml
View File

@ -1,40 +0,0 @@
# Copyright 2015 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
---
# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
- name: Ensure EPEL is enabled.
yum:
pkg: epel-release
state: installed
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Ensure build dependencies are installed.
yum:
pkg: "{{ item }}"
state: installed
with_items: diskimage_builder_build_depends
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Ensure dependencies are installed.
yum:
pkg: "{{ item }}"
state: installed
with_items: diskimage_builder_depends
when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
- name: Install diskimage-builder using yum.
yum:
pkg: "{{ diskimage_builder_pkg_name }}"
state: installed
when: diskimage_builder_install_method == 'pkg'