From 03a243136fe3d5ed20930e2ddc4e55fbbf4a0aab Mon Sep 17 00:00:00 2001 From: Ogonna Iwunze Date: Tue, 9 Feb 2016 10:46:03 +0000 Subject: [PATCH 1/6] [OI] Ensure installed rubies and gems are owned correctly by rvm1_user --- tasks/rubies.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 8bad4a6..a3944c5 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -18,11 +18,13 @@ command: '{{ rvm1_rvm }} alias list default' changed_when: False register: detect_default_ruby_version + sudo_user: '{{ rvm1_user }}' - name: Select default ruby command: '{{ rvm1_rvm }} alias create default {{ rvm1_default_ruby_version }}' when: detect_default_ruby_version.stdout|default() == '' or rvm1_default_ruby_version not in detect_default_ruby_version.stdout + sudo_user: '{{ rvm1_user }}' - name: Detect installed ruby patch number shell: > @@ -31,6 +33,7 @@ changed_when: False register: ruby_patch always_run: yes # Run even when in --check mode (http://docs.ansible.com/ansible/playbooks_checkmode.html) + sudo_user: '{{ rvm1_user }}' - name: Install bundler if not installed shell: > @@ -41,6 +44,7 @@ with_items: ruby_patch.results register: bundler_install changed_when: '"Successfully installed bundler" in bundler_install.stdout' + sudo_user: '{{ rvm1_user }}' - name: Symlink ruby related binaries on the system path file: From ea9f18ef72c7174ce1506e8aef94c27ad305dc54 Mon Sep 17 00:00:00 2001 From: Ogonna Iwunze Date: Wed, 6 Apr 2016 08:41:34 +0100 Subject: [PATCH 2/6] [OI] use "become" in place of deprecated "sudo" --- tasks/rubies.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 46d0957..7b4ac9b 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -25,7 +25,8 @@ command: '{{ rvm1_rvm }} alias create default {{ rvm1_default_ruby_version }}' when: detect_default_ruby_version.stdout|default() == '' or rvm1_default_ruby_version not in detect_default_ruby_version.stdout - sudo_user: '{{ rvm1_user }}' + become: yes + become_user: '{{ rvm1_user }}' - name: Detect installed ruby patch number shell: > @@ -34,7 +35,8 @@ changed_when: False register: ruby_patch always_run: yes # Run even when in --check mode (http://docs.ansible.com/ansible/playbooks_checkmode.html) - sudo_user: '{{ rvm1_user }}' + become: yes + become_user: '{{ rvm1_user }}' - name: Install bundler if not installed shell: > @@ -45,7 +47,8 @@ with_items: ruby_patch.results register: bundler_install changed_when: '"Successfully installed bundler" in bundler_install.stdout' - sudo_user: '{{ rvm1_user }}' + become: yes + become_user: '{{ rvm1_user }}' - name: Symlink ruby related binaries on the system path file: From 71d1347af61bbfda59be72b0d73f576325995db0 Mon Sep 17 00:00:00 2001 From: Ogonna Iwunze Date: Wed, 6 Apr 2016 08:42:47 +0100 Subject: [PATCH 3/6] [OI] use "become" in place of deprecated "sudo" --- tasks/rubies.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 7b4ac9b..8b6ed0d 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -19,7 +19,8 @@ command: '{{ rvm1_rvm }} alias list default' changed_when: False register: detect_default_ruby_version - sudo_user: '{{ rvm1_user }}' + become: yes + become_user: '{{ rvm1_user }}' - name: Select default ruby command: '{{ rvm1_rvm }} alias create default {{ rvm1_default_ruby_version }}' From f36e7f20a63d53f46ecef2a47f3c81a7dc447515 Mon Sep 17 00:00:00 2001 From: Ogonna Iwunze Date: Wed, 6 Apr 2016 10:55:40 +0100 Subject: [PATCH 4/6] [OI] Update version of Ansible installed by travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e8c3da7..f69d54f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - '__rvm_unload ; rm -rf ~/.rvm' install: - - 'pip install ansible==1.7.1' + - 'pip install ansible==2.0.0' - 'printf "[defaults]\nroles_path = ../" > ansible.cfg' script: From 4f15d0bca0120ab9bc86489db83d07c9acb2bd2d Mon Sep 17 00:00:00 2001 From: Ogonna Iwunze Date: Wed, 6 Apr 2016 11:19:59 +0100 Subject: [PATCH 5/6] [OI] Ensure "Delete ruby version" task is run as rvm1_user --- tasks/rubies.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 8b6ed0d..66d2402 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -67,8 +67,12 @@ failed_when: False register: detect_delete_ruby when: rvm1_delete_ruby + become: yes + become_user: '{{ rvm1_user }}' - name: Delete ruby version command: '{{ rvm1_rvm }} remove {{ rvm1_delete_ruby }}' changed_when: False when: rvm1_delete_ruby and detect_delete_ruby.rc == 0 + become: yes + become_user: '{{ rvm1_user }}' From 204917e56932e57f0fbfddc58cba5ac19b518b44 Mon Sep 17 00:00:00 2001 From: Ogonna Iwunze Date: Wed, 6 Apr 2016 14:24:36 +0100 Subject: [PATCH 6/6] [OI] Ensure list variables are properly interpolated when used on "with_items" --- tasks/rubies.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 66d2402..d39e91d 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -5,13 +5,13 @@ changed_when: False failed_when: False register: detect_rubies - with_items: rvm1_rubies + with_items: '{{ rvm1_rubies }}' when: rvm1_rubies - name: Install rubies command: '{{ rvm1_rvm }} install {{ item.item }} {{ rvm1_ruby_install_flags }}' 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 }}' @@ -32,7 +32,7 @@ - name: Detect installed ruby patch number shell: > {{ rvm1_rvm }} list strings | grep {{ item }} | tail -n 1 - with_items: rvm1_rubies + with_items: '{{ rvm1_rubies }}' changed_when: False register: ruby_patch always_run: yes # Run even when in --check mode (http://docs.ansible.com/ansible/playbooks_checkmode.html) @@ -45,7 +45,7 @@ | if ! grep "^bundler " ; then {{ rvm1_install_path }}/wrappers/{{ item.stdout }}/gem install bundler ; fi args: creates: '{{ rvm1_install_path }}/wrappers/{{ item.stdout }}/bundler' - with_items: ruby_patch.results + with_items: '{{ ruby_patch.results }}' register: bundler_install changed_when: '"Successfully installed bundler" in bundler_install.stdout' become: yes @@ -59,7 +59,7 @@ owner: 'root' group: 'root' when: not '--user-install' in rvm1_install_flags - with_items: rvm1_symlink_binaries + with_items: '{{ rvm1_symlink_binaries }}' - name: Detect if ruby version can be deleted command: '{{ rvm1_rvm }} {{ rvm1_delete_ruby }} do true'