Install ansible-core instead of ansible (#30)

Signed-off-by: Christian Berendt <[email protected]>
osism · Dec 28, 2023 · 932c47d · 932c47d
1 parent 020cd7f
commit 932c47d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/elements/ci-image/install.d/10-install b/elements/ci-image/install.d/10-install
@@ -15,7 +15,7 @@ apt-get install --yes ansible python3-pip
 ansible-playbook -i localhost, /tmp/in_target.d/locales.yml
 rm -rf /root/.ansible
 apt-get remove --yes ansible
+apt-get autoremove --yes
 
 # install ansible from pypi
-
-pip3 install 'ansible==8.0.0'
+pip3 install --no-cache-dir 'ansible-core>=2.15.0,<2.16.0'
diff --git a/elements/ci-image/install.d/20-ansible b/elements/ci-image/install.d/20-ansible
@@ -12,8 +12,12 @@ export LC_ALL=
 
 # install required ansible collections
 
-ansible-galaxy collection install git+https://github.com/osism/ansible-collection-services
-ansible-galaxy collection install git+https://github.com/osism/ansible-collection-commons
+ansible-galaxy collection install --collections-path /usr/share/ansible/collections ansible.netcommon
+ansible-galaxy collection install --collections-path /usr/share/ansible/collections ansible.posix
+ansible-galaxy collection install --collections-path /usr/share/ansible/collections community.docker
+
+ansible-galaxy collection install --collections-path /usr/share/ansible/collections git+https://github.com/osism/ansible-collection-services
+ansible-galaxy collection install --collections-path /usr/share/ansible/collections git+https://github.com/osism/ansible-collection-commons
 
 # run ansible playbook
 

diff --git a/playbooks/diskimage.yml b/playbooks/diskimage.yml
@@ -14,6 +14,7 @@
 
     required_packages_extra:
       - linux-generic-hwe-22.04
+      - python3-netaddr
 
   roles:
     - osism.commons.operator