From fa053b1e3fcb1be9fd0ec77ba7a8e17071ee4dc7 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 4 Aug 2020 14:41:10 +0200 Subject: [PATCH] Import the old role and add support to EL. --- README.md | 36 ++++++++++++++-------------- defaults/main.yml | 12 +++++++++- meta/main.yml | 60 ++++++++++------------------------------------- tasks/main.yml | 5 +++- tasks/py3_deb.yml | 52 ++++++++++++++++++++++++++++++++++++++++ tasks/py3_el.yml | 27 +++++++++++++++++++++ vars/main.yml | 18 +++++++++++++- 7 files changed, 142 insertions(+), 68 deletions(-) create mode 100644 tasks/py3_deb.yml create mode 100644 tasks/py3_el.yml diff --git a/README.md b/README.md index 3637db8..280cfb0 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,31 @@ Role Name ========= -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. +A role that installs python3, and python packages from pip eventually Role Variables -------------- -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. +The most important variables are listed below: + +``` yaml +py3_env_install: False +py3_env_major_version: 3 +py3_env_minor_version: 6 +py3_env_version: '{{ py3_env_major_version }}.{{py3_env_minor_version }}' +py3_env_pkgs_state: present +py3_pip_pkgs_state: present +py3_env_site: False + +py3_env_wheel_pip_pkgs: [] +py3_env_pip_pkgs: [] +py3_env_versioned_pip_pkgs: [] +``` Dependencies ------------ -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } +None License ------- @@ -35,4 +35,4 @@ EUPL-1.2 Author Information ------------------ -An optional section for the role authors to include contact information, or a website (HTML is not allowed). +Andrea Dell'Amico, diff --git a/defaults/main.yml b/defaults/main.yml index 95d3c70..9762633 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,12 @@ --- -# defaults file for ansible-role-template \ No newline at end of file +py3_env_install: False +py3_env_major_version: 3 +py3_env_minor_version: 6 +py3_env_version: '{{ py3_env_major_version }}.{{py3_env_minor_version }}' +py3_env_pkgs_state: present +py3_pip_pkgs_state: present +py3_env_site: False + +py3_env_wheel_pip_pkgs: [] +py3_env_pip_pkgs: [] +py3_env_versioned_pip_pkgs: [] diff --git a/meta/main.yml b/meta/main.yml index 1126a5e..b4d4fa9 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,61 +1,27 @@ galaxy_info: - author: your name - description: your description + author: Andrea Dell'Amico + description: Systems Architect company: ISTI-CNR - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value issue_tracker_url: https://redmine-s2i2s.isti.cnr.it/projects/provisioning - # Some suggested licenses: - # - BSD (default) - # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY - license: EUPL-1.2 + license: EUPL 1.2+ min_ansible_version: 2.8 - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (usually master) will be used. - #github_branch: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. # To view available platforms and versions (or releases), visit: # https://galaxy.ansible.com/api/v1/platforms/ # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 + platforms: + - name: Ubuntu + versions: + - trusty + - bionic + - name: EL + versions: + - 7 - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. + galaxy_tags: + - python dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. - diff --git a/tasks/main.yml b/tasks/main.yml index 53c6cae..2889d43 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,2 +1,5 @@ --- -# tasks file for ansible-role-template \ No newline at end of file +- import_tasks: py3_deb.yml + when: ansible_distribution_file_variety == "Debian" +- import_tasks: py3_el.yml + when: ansible_distribution_file_variety == "RedHat" diff --git a/tasks/py3_deb.yml b/tasks/py3_deb.yml new file mode 100644 index 0000000..4697128 --- /dev/null +++ b/tasks/py3_deb.yml @@ -0,0 +1,52 @@ +--- +- block: + - name: Install the python 3 ppa repository + apt_repository: repo={{ py3_ppa }} update_cache=yes state=present + + when: + - py3_env_install + - ansible_distribution_version is version_compare('18.04', '<') + tags: [ "python", "py3_env", "py3_env_pkgs", 'python3' ] + +- block: + - name: Install the python3 deb packages + apt: name={{ py3_env_dpkg }} state={{ py3_env_pkgs_state }} update_cache=yes cache_valid_time=600 + + - name: Install python3-pip deb packages + apt: name=python3-pip state={{ py3_env_pkgs_state }} update_cache=yes cache_valid_time=600 + when: ansible_distribution_version is version_compare('18.04', '>=') + + - name: Install the correct pip3 version on Ubuntu < 18.04 + shell: python{{ py3_env_version }} -m ensurepip && pip{{ py3_env_version }} install --upgrade pip setuptools wheel + when: ansible_distribution_version is version_compare('18.04', '<') + + - name: Install a list of versioned pip3 packages on Ubuntu older than Trusty + pip: executable=pip{{ py3_env_version }} name={{ item.pkg }} version={{ item.version }} + with_items: '{{ py3_env_versioned_pip_pkgs | default ([]) }}' + when: ansible_distribution_version is version_compare('18.04', '<') + + - name: Install a list of pip3 packages on Ubuntu older than Trusty + pip: executable=pip{{ py3_env_version }} name={{ py3_env_pip_pkgs }} state={{ py3_pip_pkgs_state }} + when: ansible_distribution_version is version_compare('18.04', '<') + + - name: Ensure that we have the latest pip, setuptools and wheel versions + pip: + executable: 'pip{{ py3_env_major_version }}' + name: '{{ py3_env_pip_default_pkgs }}' + state: latest + + - name: Install a list of binary pip3 packages in wheels format + pip: executable=pip{{ py3_env_major_version }} name={{ py3_env_wheel_pip_pkgs }} state={{ py3_pip_pkgs_state }} + + - name: Install a list of versioned pip3 packages on Ubuntu Bionic or newer + pip: executable=pip{{ py3_env_major_version }} name={{ item.pkg }} version={{ item.version }} + with_items: '{{ py3_env_versioned_pip_pkgs | default ([]) }}' + when: ansible_distribution_version is version_compare('18.04', '>=') + + - name: Install a list of pip3 packages on Ubuntu Bionic or newer + pip: executable=pip{{ py3_env_major_version }} name={{ py3_env_pip_pkgs }} state={{ py3_pip_pkgs_state }} + when: ansible_distribution_version is version_compare('18.04', '>=') + + when: py3_env_install + tags: [ "python", "py3_env", "py3_env_pkgs", 'python3' ] + diff --git a/tasks/py3_el.yml b/tasks/py3_el.yml new file mode 100644 index 0000000..d2396d5 --- /dev/null +++ b/tasks/py3_el.yml @@ -0,0 +1,27 @@ +--- +- block: + - name: Install the python3 EL packages + yum: name={{ py3_env_dpkg }} state={{ py3_env_pkgs_state }} + +# - name: Install the correct pip3 version +# shell: python{{ py3_env_version }} -m ensurepip && pip{{ py3_env_version }} install --upgrade pip setuptools wheel + + - name: Ensure that we have the latest pip, setuptools and wheel versions + pip: + executable: 'pip{{ py3_env_major_version }}' + name: '{{ py3_env_pip_default_pkgs }}' + state: latest + + - name: Install a list of binary pip3 packages in wheels format + pip: executable=pip{{ py3_env_major_version }} name={{ py3_env_wheel_pip_pkgs }} state={{ py3_pip_pkgs_state }} + + - name: Install a list of versioned pip3 packages on EL + pip: executable=pip{{ py3_env_major_version }} name={{ item.pkg }} version={{ item.version }} + with_items: '{{ py3_env_versioned_pip_pkgs | default ([]) }}' + + - name: Install a list of pip3 packages on EL + pip: executable=pip{{ py3_env_major_version }} name={{ py3_env_pip_pkgs }} state={{ py3_pip_pkgs_state }} + + when: py3_env_install + tags: [ "python", "py3_env", "py3_env_pkgs", 'python3' ] + diff --git a/vars/main.yml b/vars/main.yml index 3808477..530984c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,18 @@ --- -# vars file for ansible-role-template \ No newline at end of file +py3_ppa: 'ppa:deadsnakes/ppa' + +py3_env_dpkg: + - 'python{{ py3_env_version }}' + - 'python{{ py3_env_version }}-venv' + - 'python{{ py3_env_version }}-dev' + +py3_env_pip_default_pkgs: + - 'pip' + - 'setuptools' + - 'wheel' + +py3_el_env_version: '{{ py3_env_major_version }}{{py3_env_minor_version }}' +py3_el_env_pkg: + - 'python{{ py3_env_major_version }}' + - 'python{{ py3_env_major_version }}-pip' + - 'python{{ py3_env_major_version }}-setuptools'