Skip to content

Commit

Permalink
Added support for Debian (8.1)
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Aug 27, 2015
1 parent c55eb41 commit e53f97b
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ install:
# Install Ansible.
- if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install ansible==$ANSIBLE_VERSION; fi

# Add ansible.cfg to pick up roles path.
- printf "[defaults]\nroles_path = ../" > ansible.cfg

script:
# Check the role/playbook's syntax.
- ansible-playbook -i tests/inventory tests/test.yml --syntax-check
Expand Down
10 changes: 8 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

role = File.basename(File.expand_path(File.dirname(__FILE__)))

File.open(File.dirname(__FILE__) + '/ansible.cfg', 'w') { |f| f.write("[defaults]\nroles_path = ../") }

boxes = [
{
:name => "ubuntu-1004",
Expand Down Expand Up @@ -46,6 +44,14 @@ boxes = [
:cpu => "50",
:ram => "256"
},
{
:name => "debian-81",
:box => "opscode-debian-8.1",
:url => "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box",
:ip => '10.0.0.15',
:cpu => "50",
:ram => "256"
},
]

Vagrant.configure("2") do |config|
Expand Down
8 changes: 6 additions & 2 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- all
- lucid
- precise
- trusty
- name: Debian
versions:
- all
- squeeze
- wheezy
- jessie
categories:
- system
dependencies: []
8 changes: 3 additions & 5 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
name: "{{ item }}"
state: latest
with_items: locales_language_packs_present
when: locales_language_packs_present
when: ansible_distribution == 'Ubuntu'
notify: update locales
tags: [configuration, locales, locales-language-packs-present]

Expand All @@ -22,7 +22,7 @@
name: "{{ item }}"
state: absent
with_items: locales_language_packs_absent
when: locales_language_packs_absent
when: ansible_distribution == 'Ubuntu'
notify: update locales
tags: [configuration, locales, locales-language-packs-absent]

Expand All @@ -36,23 +36,21 @@
file:
path: "{{ locales_gen_file }}"
state: touch
when: not locales_gen_file_stats.stat.exists
when: locales_gen_file_stats.stat.exists == false
tags: [configuration, locales, locales-gen-file]

- name: make sure (specified) locales are present
locale_gen:
name: "{{ item }}"
state: present
with_items: locales_present
when: locales_present
tags: [configuration, locales, locales-present]

- name: make sure (specified) locales are absent
locale_gen:
name: "{{ item }}"
state: absent
with_items: locales_absent
when: locales_absent
tags: [configuration, locales, locales-absent]

- name: set default locale
Expand Down
2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
- hosts: localhost
remote_user: root
roles:
- ansible-locales
- ../../
2 changes: 1 addition & 1 deletion tests/vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
remote_user: vagrant
sudo: true
roles:
- locales
- ../../

0 comments on commit e53f97b

Please sign in to comment.