Skip to content

Commit

Permalink
Merge pull request #3 from RafalNiewinski/master
Browse files Browse the repository at this point in the history
Fixed [DEPRECATED] warnings and failing tasks messages
  • Loading branch information
MiLk authored Jun 24, 2016
2 parents b7b3975 + 63ced5e commit b79d980
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tasks/install_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
yum:
name: "{{ item }}"
state: present
with_items: rvm.required_packages
with_items: "{{ rvm.required_packages }}"
when: ansible_os_family == "RedHat"

- name: ensure necessary apt packages are installed
apt:
name: "{{ item }}"
state: present
with_items: rvm.required_packages
with_items: "{{ rvm.required_packages }}"
when: ansible_os_family == "Debian"
11 changes: 5 additions & 6 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@
- include: ./install_packages.yml

- name: checking that RVM is installed
file:
path: "{{rvm.init_script}}"
state: file
shell: cat "{{rvm.init_script}}"
ignore_errors: True
failed_when: False
register: rvm_install_result

- include: ./install_rvm.yml
when: rvm_install_result|failed
when: rvm_install_result.rc != 0

- include: ./update_rvm.yml
when: rvm.auto_update_rvm and rvm_install_result|success
when: rvm.auto_update_rvm and rvm_install_result.rc == 0

- include: ./select_ruby.yml

- include: ./install_ruby.yml
when: rvm_select_ruby_version|failed
when: rvm_select_ruby_version.rc != 0
1 change: 1 addition & 0 deletions tasks/select_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
shell: "source {{rvm.init_script}} && rvm use {{rvm.default_ruby_version}} --default executable=/bin/bash"
register: rvm_select_ruby_version
ignore_errors: True
failed_when: False
changed_when: False

0 comments on commit b79d980

Please sign in to comment.