Become and become_user moved to main.yml file

This commit is contained in:
lpaulmp
2016-11-06 18:40:05 -05:00
parent ab52a26122
commit df72876642
3 changed files with 9 additions and 24 deletions

View File

@@ -1,4 +1,11 @@
--- ---
- include: 'rvm.yml' - name: Install RVM
- include: 'rubies.yml' include: 'rvm.yml'
become: yes
become_user: '{{ rvm1_user }}'
- name: Install Ruby and Gems
include: 'rubies.yml'
become: yes
become_user: '{{ rvm1_user }}'

View File

@@ -12,22 +12,16 @@
command: '{{ rvm1_rvm }} install {{ item.item }} {{ rvm1_ruby_install_flags }}' command: '{{ rvm1_rvm }} install {{ item.item }} {{ rvm1_ruby_install_flags }}'
when: rvm1_rubies and item.rc|default(0) != 0 when: rvm1_rubies and item.rc|default(0) != 0
with_items: '{{ detect_rubies.results }}' with_items: '{{ detect_rubies.results }}'
become: yes
become_user: '{{ rvm1_user }}'
- name: Detect default ruby version - name: Detect default ruby version
command: '{{ rvm1_rvm }} alias list default' command: '{{ rvm1_rvm }} alias list default'
changed_when: False changed_when: False
register: detect_default_ruby_version register: detect_default_ruby_version
become: yes
become_user: '{{ rvm1_user }}'
- name: Select default ruby - name: Select default ruby
command: '{{ rvm1_rvm }} alias create default {{ rvm1_default_ruby_version }}' command: '{{ rvm1_rvm }} alias create default {{ rvm1_default_ruby_version }}'
when: detect_default_ruby_version.stdout|default() == '' or when: detect_default_ruby_version.stdout|default() == '' or
rvm1_default_ruby_version not in detect_default_ruby_version.stdout rvm1_default_ruby_version not in detect_default_ruby_version.stdout
become: yes
become_user: '{{ rvm1_user }}'
- name: Detect installed ruby patch number - name: Detect installed ruby patch number
shell: > shell: >
@@ -36,8 +30,6 @@
changed_when: False changed_when: False
register: ruby_patch register: ruby_patch
always_run: yes # Run even when in --check mode (http://docs.ansible.com/ansible/playbooks_checkmode.html) always_run: yes # Run even when in --check mode (http://docs.ansible.com/ansible/playbooks_checkmode.html)
become: yes
become_user: '{{ rvm1_user }}'
- name: Install bundler if not installed - name: Install bundler if not installed
shell: > shell: >
@@ -48,8 +40,6 @@
with_items: '{{ ruby_patch.results }}' with_items: '{{ ruby_patch.results }}'
register: bundler_install register: bundler_install
changed_when: '"Successfully installed bundler" in bundler_install.stdout' changed_when: '"Successfully installed bundler" in bundler_install.stdout'
become: yes
become_user: '{{ rvm1_user }}'
- name: Symlink ruby related binaries on the system path - name: Symlink ruby related binaries on the system path
file: file:
@@ -67,12 +57,8 @@
failed_when: False failed_when: False
register: detect_delete_ruby register: detect_delete_ruby
when: rvm1_delete_ruby when: rvm1_delete_ruby
become: yes
become_user: '{{ rvm1_user }}'
- name: Delete ruby version - name: Delete ruby version
command: '{{ rvm1_rvm }} remove {{ rvm1_delete_ruby }}' command: '{{ rvm1_rvm }} remove {{ rvm1_delete_ruby }}'
changed_when: False changed_when: False
when: rvm1_delete_ruby and detect_delete_ruby.rc == 0 when: rvm1_delete_ruby and detect_delete_ruby.rc == 0
become: yes
become_user: '{{ rvm1_user }}'

View File

@@ -30,8 +30,6 @@
command: 'gpg --keyserver {{ rvm1_gpg_key_server }} --recv-keys {{ rvm1_gpg_keys }}' command: 'gpg --keyserver {{ rvm1_gpg_key_server }} --recv-keys {{ rvm1_gpg_keys }}'
changed_when: False changed_when: False
when: rvm1_gpg_keys != '' when: rvm1_gpg_keys != ''
become: yes
become_user: '{{ rvm1_user }}'
register: result register: result
until: result.rc == 0 until: result.rc == 0
retries: 5 retries: 5
@@ -42,18 +40,12 @@
{{ rvm1_temp_download_path }}/rvm-installer.sh {{ rvm1_rvm_version }} {{ rvm1_temp_download_path }}/rvm-installer.sh {{ rvm1_rvm_version }}
--path {{ rvm1_install_path }} {{ rvm1_install_flags }} --path {{ rvm1_install_path }} {{ rvm1_install_flags }}
when: not rvm_binary.stat.exists when: not rvm_binary.stat.exists
become: yes
become_user: '{{ rvm1_user }}'
- name: Update rvm - name: Update rvm
shell: '{{ rvm1_rvm }} get {{ rvm1_rvm_version }} && {{ rvm1_rvm }} reload' shell: '{{ rvm1_rvm }} get {{ rvm1_rvm_version }} && {{ rvm1_rvm }} reload'
changed_when: False changed_when: False
when: rvm_binary.stat.exists and rvm1_rvm_check_for_updates when: rvm_binary.stat.exists and rvm1_rvm_check_for_updates
become: yes
become_user: '{{ rvm1_user }}'
- name: Configure rvm - name: Configure rvm
command: '{{ rvm1_rvm }} autolibs {{ rvm1_autolib_mode }}' command: '{{ rvm1_rvm }} autolibs {{ rvm1_autolib_mode }}'
when: not rvm_binary.stat.exists when: not rvm_binary.stat.exists
become: yes
become_user: '{{ rvm1_user }}'