mirror of https://github.com/ceph/ceph-ansible.git
refact the 'raw' installation of python
to avoid duplicating code in `site.yml.sample`, `site-docker.yml.sample` and `setup.yml`, let's isolate this part of the code and simply include it each time we need it. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/3514/head
parent
55fab6f547
commit
b94290af43
|
@ -20,3 +20,4 @@ ceph-ansible.spec
|
||||||
*.pytest_cache
|
*.pytest_cache
|
||||||
!.travis.yml
|
!.travis.yml
|
||||||
!.mergify.yml
|
!.mergify.yml
|
||||||
|
!raw_install_python.yml
|
|
@ -0,0 +1,24 @@
|
||||||
|
---
|
||||||
|
- name: check for python
|
||||||
|
stat:
|
||||||
|
path: /usr/bin/python
|
||||||
|
ignore_errors: yes
|
||||||
|
register: systempython
|
||||||
|
|
||||||
|
- name: install python for debian based systems
|
||||||
|
raw: apt-get -y install python-simplejson
|
||||||
|
ignore_errors: yes
|
||||||
|
when:
|
||||||
|
- systempython.stat is undefined or not systempython.stat.exists
|
||||||
|
|
||||||
|
- name: install python for fedora
|
||||||
|
raw: dnf -y install python3; ln -sf /usr/bin/python3 /usr/bin/python creates=/usr/bin/python
|
||||||
|
ignore_errors: yes
|
||||||
|
when:
|
||||||
|
- systempython.stat is undefined or not systempython.stat.exists
|
||||||
|
|
||||||
|
- name: install python for opensuse
|
||||||
|
raw: zypper -n install python-base creates=/usr/bin/python2.7
|
||||||
|
ignore_errors: yes
|
||||||
|
when:
|
||||||
|
- systempython.stat is undefined or not systempython.stat.exists
|
|
@ -21,6 +21,9 @@
|
||||||
vars:
|
vars:
|
||||||
delegate_facts_host: True
|
delegate_facts_host: True
|
||||||
|
|
||||||
|
pre_tasks:
|
||||||
|
- import_tasks: raw_install_python.yml
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
# pre-tasks for following import -
|
# pre-tasks for following import -
|
||||||
- name: gather facts
|
- name: gather facts
|
||||||
|
|
|
@ -27,29 +27,8 @@
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
# If we can't get python2 installed before any module is used we will fail
|
# If we can't get python2 installed before any module is used we will fail
|
||||||
# so just try what we can to get it installed
|
# so just try what we can to get it installed
|
||||||
- name: check for python2
|
|
||||||
stat:
|
|
||||||
path: /usr/bin/python
|
|
||||||
ignore_errors: yes
|
|
||||||
register: systempython2
|
|
||||||
|
|
||||||
- name: install python2 for debian based systems
|
- import_tasks: raw_install_python.yml
|
||||||
raw: sudo apt-get -y install python-simplejson
|
|
||||||
ignore_errors: yes
|
|
||||||
when:
|
|
||||||
- systempython2.stat is undefined or not systempython2.stat.exists
|
|
||||||
|
|
||||||
- name: install python2 for fedora
|
|
||||||
raw: sudo dnf -y install python creates=/usr/bin/python
|
|
||||||
ignore_errors: yes
|
|
||||||
when:
|
|
||||||
- systempython2.stat is undefined or not systempython2.stat.exists
|
|
||||||
|
|
||||||
- name: install python2 for opensuse
|
|
||||||
raw: sudo zypper -n install python-base creates=/usr/bin/python2.7
|
|
||||||
ignore_errors: yes
|
|
||||||
when:
|
|
||||||
- systempython2.stat is undefined or not systempython2.stat.exists
|
|
||||||
|
|
||||||
- name: gather facts
|
- name: gather facts
|
||||||
setup:
|
setup:
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
---
|
---
|
||||||
|
- hosts: all
|
||||||
|
gather_facts: false
|
||||||
|
become: yes
|
||||||
|
tasks:
|
||||||
|
- import_tasks: ../../raw_install_python.yml
|
||||||
|
|
||||||
- hosts: osds
|
- hosts: osds
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- hosts: all
|
- hosts: all
|
||||||
gather_facts: true
|
gather_facts: true
|
||||||
become: yes
|
become: yes
|
||||||
|
|
Loading…
Reference in New Issue