Merge pull request 'master' (!236) from adellam/ansible-roles:master into master

Reviewed-on: ISTI-ansible-roles/ansible-roles#236
2021-10-12 18:13:12 +02:00 · 2021-10-12 18:13:12 +02:00 · fbdc1cbc16
parent f324f6aa38 318cfee1c0
commit fbdc1cbc16
2 changed files with 10 additions and 3 deletions
--- a/library/roles/freeradius/meta/main.yml
+++ b/library/roles/freeradius/meta/main.yml
@ -1,5 +1,10 @@
 ---
 dependencies:
-  - { role: '../../library/roles/memcached', when: freeradius_local_memcache_support }
-  - { role: '../../library/roles/redis', when: freeradius_local_redis_support }
-
+- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-memcached.git
+  version: master
+  name: memcached
+  state: latest
+- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-redis.git
+  version: master
+  name: redis
+  state: latest
--- a/library/roles/ubuntu-deb-general/defaults/main.yml
+++ b/library/roles/ubuntu-deb-general/defaults/main.yml
@ -42,6 +42,8 @@ default_python_packages:
  - python3-lxml
  - python-boto
  - python-ipaddress
+  - python-setuptools
+  - python3-setuptools

 # Set this variable in your playbook
 # additional_packages: