Skip to content
Snippets Groups Projects
Commit 7507031c authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files

CoreOS bootstrap: set bin_dir and PATH for pip.

parent d73d60c9
Branches
Tags
No related merge requests found
...@@ -7,23 +7,32 @@ ...@@ -7,23 +7,32 @@
tags: tags:
- facts - facts
- name: Force binaries directory for Container Linux by CoreOS
set_fact:
bin_dir: "/opt/bin"
tags:
- facts
when: need_bootstrap.rc != 0
- name: Bootstrap | Run bootstrap.sh - name: Bootstrap | Run bootstrap.sh
script: bootstrap.sh script: bootstrap.sh
when: need_bootstrap.rc != 0 when: need_bootstrap.rc != 0
- set_fact: - set_fact:
ansible_python_interpreter: "/opt/bin/python" ansible_python_interpreter: "{{ bin_dir }}/python"
tags: tags:
- facts - facts
- name: Bootstrap | Check if we need to install pip - name: Bootstrap | Check if we need to install pip
shell: "{{ansible_python_interpreter}} -m pip --version" shell: "pip --version"
register: need_pip register: need_pip
failed_when: false failed_when: false
changed_when: false changed_when: false
check_mode: no check_mode: no
tags: tags:
- facts - facts
environment:
PATH: "{{ ansible_env.PATH }}:{{ bin_dir }}"
- name: Bootstrap | Copy get-pip.py - name: Bootstrap | Copy get-pip.py
copy: copy:
...@@ -44,7 +53,7 @@ ...@@ -44,7 +53,7 @@
- name: Bootstrap | Install pip launcher - name: Bootstrap | Install pip launcher
copy: copy:
src: runner src: runner
dest: /opt/bin/pip dest: "{{ bin_dir }}/pip"
mode: 0755 mode: 0755
when: need_pip.rc != 0 when: need_pip.rc != 0
...@@ -52,3 +61,5 @@ ...@@ -52,3 +61,5 @@
pip: pip:
name: "{{ item }}" name: "{{ item }}"
with_items: "{{pip_python_coreos_modules}}" with_items: "{{pip_python_coreos_modules}}"
environment:
PATH: "{{ ansible_env.PATH }}:{{ bin_dir }}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment