Skip to content

Commit

Permalink
Merge pull request #12 from tobijb/master_centos_6_5
Browse files Browse the repository at this point in the history
Add CentOS/RHEL 6.5 Support
  • Loading branch information
nickjj committed Sep 30, 2014
2 parents 455396f + a27e044 commit 97a48bd
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 10 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ Just add `--extra-vars 'rvm1_delete_ruby=ruby-2.1.0'` to the end of your play bo

## Requirements

Tested on ubuntu 12.04 LTS but it should work on other versions that are similar.
- Tested on ubuntu 12.04 LTS but it should work on other versions that are similar.
- Tested on RHEL6.5 and CentOS 6.5

## Ansible galaxy

Expand Down
5 changes: 4 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ galaxy_info:
min_ansible_version: 1.5

platforms:
- name: EL
versions:
- all
- name: Ubuntu
versions:
- all
Expand All @@ -15,4 +18,4 @@ galaxy_info:
- development
- web

dependencies: []
dependencies: []
10 changes: 10 additions & 0 deletions tasks/debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---

- name: Debian/Ubuntu - Install httplib2 to use the uri module
apt:
pkg: 'python-httplib2'
state: 'latest'
update_cache: True
cache_valid_time: '{{ apt_cache_valid_time }}'
sudo: True
sudo_user: root
13 changes: 5 additions & 8 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
---

- name: Install httplib2 to use the uri module
apt:
pkg: 'python-httplib2'
state: 'latest'
update_cache: True
cache_valid_time: '{{ apt_cache_valid_time }}'
sudo: True
sudo_user: root
- include: 'debian.yml'
when: ansible_os_family == 'Debian'

- include: 'redhat.yml'
when: ansible_os_family == 'RedHat'

- include: 'rvm.yml'
- include: 'rubies.yml'
8 changes: 8 additions & 0 deletions tasks/redhat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---

- name: RedHat/CentOS - Install httplib2 to use the uri module
yum:
pkg: 'python-httplib2'
state: 'latest'
sudo: True
sudo_user: root

0 comments on commit 97a48bd

Please sign in to comment.