diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..5135e91 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,2 @@ +--- +python3_packages_extra: [] diff --git a/molecule/ec2-centos-7/playbook.yml b/molecule/ec2-centos-7/playbook.yml index 9b5558b..d765f9d 100644 --- a/molecule/ec2-centos-7/playbook.yml +++ b/molecule/ec2-centos-7/playbook.yml @@ -2,14 +2,8 @@ - name: Converge hosts: all vars: - yum_repositories: - epel: - filename: Extra-EPEL - desc: Extra Packages for Enterprise Linux (EPEL) - baseurl: "http://download.fedoraproject.org/pub/epel/$releasever/$basearch/" - gpgkey: "http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever/" - enabled: True + python3_packages_extra: + - epel-release roles: - - role: xoxys.yum - role: xoxys.python3 diff --git a/requirements.yml b/requirements.yml deleted file mode 100644 index 397883f..0000000 --- a/requirements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- src: https://gitea.rknet.org/ansible/xoxys.yum.git - name: xoxys.yum - scm: git - version: master diff --git a/tasks/setup.yml b/tasks/setup.yml index 6036a83..e57f89b 100644 --- a/tasks/setup.yml +++ b/tasks/setup.yml @@ -4,8 +4,7 @@ package: name: "{{ item }}" state: present - with_items: - - python36 + loop: "{{ python3_packages_extra + python3_packages | default(__python3_packages) }}" - name: Check for installed pip3 stat: diff --git a/vars/main.yml b/vars/main.yml index 718fddd..19bbfed 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,4 @@ --- +__python3_packages: + - python36 __python3_link_bin_path: /usr/bin