diff --git a/ansible/family_vars/archlinux.yml b/ansible/family_vars/archlinux.yml index 99f86104..9805958c 100644 --- a/ansible/family_vars/archlinux.yml +++ b/ansible/family_vars/archlinux.yml @@ -19,6 +19,5 @@ common_packages: - ipvsadm - sysstat - python-pyopenssl # Needed for ansible 'openssl_certificate_info' module - - python-pip # Needed for ansible openshift module common_rpi_cmd_file: /boot/cmdline.txt common_rpi_config_file: /boot/config.txt diff --git a/ansible/family_vars/debian.yml b/ansible/family_vars/debian.yml index b06263ab..b591a742 100644 --- a/ansible/family_vars/debian.yml +++ b/ansible/family_vars/debian.yml @@ -12,4 +12,4 @@ common_packages: - ipvsadm - net-tools - python3-openssl # Needed for ansible 'openssl_certificate_info' module - - python3-pip + - python-openshift diff --git a/ansible/roles/common/tasks/archlinux.yml b/ansible/roles/common/tasks/archlinux.yml index 249a7a77..aacdd766 100644 --- a/ansible/roles/common/tasks/archlinux.yml +++ b/ansible/roles/common/tasks/archlinux.yml @@ -78,3 +78,11 @@ state: absent when: - not yay.stat.exists + +- name: 'install openshift kubernetes module' + aur: + name: + - python-openshift + use: yay + state: present + become: false diff --git a/ansible/roles/common/tasks/debian.yml b/ansible/roles/common/tasks/debian.yml index 696f5809..a6018a93 100644 --- a/ansible/roles/common/tasks/debian.yml +++ b/ansible/roles/common/tasks/debian.yml @@ -1,4 +1,15 @@ --- + +- name: 'add apt key for openshift kubernetes module (1/2)' + ansible.builtin.apt_key: + keyserver: keyserver.ubuntu.com + id: ADF016E51783213C8A8C831A1348C52605DB2FE6 + +- name: 'add OBS repo for openshift kubernetes module (2/2)' + ansible.builtin.apt_repository: + repo: deb http://download.opensuse.org/repositories/home:/anthr76:/kubernetes/Ubuntu_20.04/ / + state: present + - name: apt-get upgrade apt: upgrade: full @@ -25,11 +36,6 @@ retries: 5 until: apt_install_common is success -- name: install common Kubernetes ansible module - pip: - name: - - openshift - - name: install and configure log2ram include_tasks: log2ram.yml when: common_log2ram_enabled