- add support for Zabbix7

- use invidual  pyhton venv (instead of global one)
- bump ansible version to 10.7, minor changes over some tasks

Author: jkrue

bibigrid/core/utility/ansible_commands.py

@@ -49,7 +49,7 @@
                         "Adjust playbook home permission.")
 MV_ANSIBLE_CONFIG = (
     "sudo install -D /opt/playbook/ansible.cfg /etc/ansible/ansible.cfg", "Move ansible configuration.")
-EXECUTE = (f"ansible-playbook {os.path.join(a_rp.PLAYBOOK_PATH_REMOTE, a_rp.SITE_YAML)} -i "
+EXECUTE = (f"/opt/bibigrid-venv/bin/ansible-playbook {os.path.join(a_rp.PLAYBOOK_PATH_REMOTE, a_rp.SITE_YAML)} -i "
            f"{os.path.join(a_rp.PLAYBOOK_PATH_REMOTE, a_rp.ANSIBLE_HOSTS)} -l {{}}",
            "Execute ansible playbook. Be patient.")
 
@@ -58,5 +58,7 @@
     "while [[ $(systemctl is-active {service}) == 'active' ]]; do echo 'Waiting for service {service}'; sleep 2; done",
     "Waiting for service {service}.")
 UPDATE = ("sudo apt-get update", "Update apt repository lists.")
-PYTHON3_PIP = "sudo apt-get install -y python3-pip", "Install python3 pip using apt."
-ANSIBLE_PASSLIB = ("sudo pip install ansible==6.6 passlib", "Install Ansible and Passlib using pip.")
+PYTHON3_PIP = ("sudo apt-get install -y python3-pip python3-venv", "Install python3 pip and venv using apt.")
+VENV_SETUP = ("sudo python3 -m venv /opt/bibigrid-venv"," Create bibigrid virtual environment.")
+ANSIBLE_PASSLIB = ("sudo /opt/bibigrid-venv/bin/pip install ansible==10.7 passlib", "Install Ansible 10.7 and Passlib using pip.")
+ANSIBLE_GALAXY = ("sudo /opt/bibigrid-venv/bin/ansible-galaxy collection install -p /usr/share/ansible/collections community.zabbix==3.2.0", "Install necessary ansible-galaxy modules.")

bibigrid/core/utility/handler/ssh_handler.py

@@ -14,7 +14,7 @@
 from bibigrid.models.exceptions import ConnectionException, ExecutionException
 
 PRIVATE_KEY_FILE = ".ssh/id_ecdsa"  # to name bibigrid-temp keys identically on remote
-ANSIBLE_SETUP = [a_c.NO_UPDATE, a_c.UPDATE, a_c.PYTHON3_PIP, a_c.ANSIBLE_PASSLIB,
+ANSIBLE_SETUP = [a_c.NO_UPDATE, a_c.UPDATE, a_c.PYTHON3_PIP, a_c.VENV_SETUP, a_c.ANSIBLE_PASSLIB, a_c.ANSIBLE_GALAXY,
                  (f"chmod 600 {PRIVATE_KEY_FILE}", "Adjust private key permissions."), a_c.PLAYBOOK_HOME,
                  a_c.PLAYBOOK_HOME_RIGHTS, a_c.ADD_PLAYBOOK_TO_LINUX_HOME]
 # ANSIBLE_START = [aC.WAIT_READY, aC.UPDATE, aC.MV_ANSIBLE_CONFIG, aC.EXECUTE]  # another UPDATE seems to not necessary.

resources/playbook/roles/bibigrid/files/slurm/create.sh

@@ -37,6 +37,8 @@ log "Create-Script started"
 
 hosts=$(scontrol show hostnames "$1")
 
+# use python bibigrid environment
+source /opt/bibigrid-venv/bin/activate
 
 # create and configure requested instances
 python3 /usr/local/bin/create_server.py "${hosts}"

resources/playbook/roles/bibigrid/files/slurm/create_server.py

@@ -341,7 +341,7 @@ def _run_playbook(cmdline_args):
     @param cmdline_args:
     @return
     """
-    executable_cmd = '/usr/local/bin/ansible-playbook'
+    executable_cmd = '/opt/bibigrid-venv/bin/ansible-playbook'
     logging.info(f"run_command...\nexecutable_cmd: {executable_cmd}\ncmdline_args: {cmdline_args}")
     runner = ansible_runner.interface.init_command_config(executable_cmd=executable_cmd, cmdline_args=cmdline_args)
 

resources/playbook/roles/bibigrid/files/slurm/terminate.sh

@@ -14,6 +14,9 @@ scontrol update NodeName="$1" state=RESUME reason=FailedStartup # no sudo needed
 
 hosts=$(scontrol show hostnames "$1")
 
+# use python bibigrid environment
+source /opt/bibigrid-venv/bin/activate
+
 # delete servers
 python3 /usr/local/bin/delete_server.py "${hosts}"
 

resources/playbook/roles/bibigrid/handlers/main.yml

@@ -35,9 +35,9 @@
     name: slurmd
     state: restarted
 
-- name: zabbix-agent
+- name: zabbix-agent2
   systemd:
-    name: zabbix-agent
+    name: zabbix-agent2
     state: restarted
 
 - name: zabbix-server

resources/playbook/roles/bibigrid/tasks/001-apt.yaml

@@ -48,9 +48,7 @@
 
 - name: Add zabbix repositories
   apt:
-    deb: "https://repo.zabbix.com/zabbix/6.2/{{ ansible_distribution | lower }}\
-    /pool/main/z/zabbix-release/zabbix-release_6.2-1%2B{{ ansible_distribution | lower }}\
-    {{ ansible_distribution_version }}_all.deb"
+    deb: "https://repo.zabbix.com/zabbix/7.0/ubuntu/pool/main/z/zabbix-release/zabbix-release_latest_7.0+{{ ansible_distribution | lower }}{{ ansible_distribution_version }}_all.deb"
     state: present
     force: true
   tags:

resources/playbook/roles/bibigrid/tasks/011-zabbix-agent.yaml

@@ -21,12 +21,12 @@
     group: zabbix
     mode: "0o755"
 
-- name: Adjust zabbix agent configuration
+- name: Adjust zabbix agent2 configuration
   template:
-    src: zabbix/zabbix_agentd.conf.j2
-    dest: /etc/zabbix/zabbix_agentd.conf
+    src: zabbix/zabbix_agent2.conf.j2
+    dest: /etc/zabbix/zabbix_agent2.conf
     mode: "0o644"
-  notify: zabbix-agent
+  notify: zabbix-agent2
 
 - name: Copy Zabbix Host delete script
   copy:
@@ -38,9 +38,9 @@
   pip:
     name: zabbix-api
 
-- name: Install zabbix agent
+- name: Install zabbix agent2
   apt:
-    name: zabbix-agent
+    name: zabbix-agent2
     state: present
   when: "ansible_distribution_file_variety == 'Debian'"
 
@@ -50,9 +50,9 @@
     state: present
   when: "ansible_distribution_file_variety == 'RedHat'"
 
-- name: Start and Enable zabbix-agent
+- name: Start and Enable zabbix-agent2
   systemd:
-    name: zabbix-agent
+    name: zabbix-agent2
     state: started
     enabled: true
 
@@ -61,10 +61,14 @@
 # --------------------------------------
 
 - name: Add worker node to zabbix hosts
+  vars:
+    ansible_network_os: community.zabbix.zabbix
+    ansible_connection: httpapi
+    ansible_httpapi_port: 80
+    ansible_http_use_ssl: false
+    ansible_user: Admin
+    ansible_httpapi_pass: "{{ zabbix_conf.admin_password }}"  
   zabbix_host:
-    server_url: "http://127.0.0.1/zabbix/"
-    login_user: Admin
-    login_password: "{{ zabbix_conf.admin_password }}"
     host_name: "{{ ansible_hostname }}"
     visible_name: "{{ ansible_hostname }}"
     description: add by ansible
@@ -84,11 +88,19 @@
   when: "'master' not in group_names"
   delegate_to: localhost
 
+# --------------------------------------
+# -- Add master node as zabbix hosts --
+# --------------------------------------
+
 - name: Add master node to zabbix hosts
+  vars:
+    ansible_network_os: community.zabbix.zabbix
+    ansible_connection: httpapi
+    ansible_httpapi_port: 80
+    ansible_http_use_ssl: false
+    ansible_user: Admin
+    ansible_httpapi_pass: "{{ zabbix_conf.admin_password }}"
   zabbix_host:
-    server_url: "http://127.0.0.1/zabbix/"
-    login_user: Admin
-    login_password: "{{ zabbix_conf.admin_password }}"
     host_name: "{{ ansible_hostname }}"
     visible_name: "{{ ansible_hostname }}"
     description: add by ansible
@@ -105,4 +117,4 @@
         useip: 1 # connect using host IP address
         port: 10050
   become: false
-  when: "'master' in group_names"
+  when: "'master' in group_names"

resources/playbook/roles/bibigrid/tasks/042-slurm-server.yaml

@@ -154,7 +154,7 @@
     mode: "0o750"
 
 - name: Install python dependencies
-  pip:
+  ansible.builtin.pip:
     name:
       - python-openstackclient==6.0.0
       - openstacksdk==0.62.0
@@ -163,6 +163,7 @@
       - paramiko
       - ansible-runner
       - pyzabbix
+    virtualenv: /opt/bibigrid-venv
 
 - name: 'Add default user to ansible group'
   user:

resources/playbook/roles/bibigrid/tasks/900-theia.yaml

@@ -43,7 +43,6 @@
   args:
     creates: "{{ nvm_install_dir }}/nvm.sh"
     executable: bash
-    warn: false
   tags:
     - skip_ansible_lint