Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I54938c4c0918d83560ecbc7b1f615734413b7f41
softwarefactory-project · Jan 25, 2023 · 20d7af3 · 20d7af3
2 parents 0411215 + d8d15b2
commit 20d7af3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/ansible/roles/sf-logserver/tasks/install.yml b/ansible/roles/sf-logserver/tasks/install.yml
@@ -2,7 +2,7 @@
 - service_facts:
   run_once: true
 
-- name: "Remove packages if {{ role_package }} is a container"
+- name: "Remove packages"
   block:
     - name: Stop services
       service:
@@ -16,10 +16,7 @@
           - httpd
           - mod_wsgi
         state: absent
-  when:
-    - "'{{ role_package }}.service' in {{ ansible_facts.services }}"
-    - "'gateway' not in roles"
-    - "'cauth' not in roles"
+  when: "'gateway' not in roles"
 
 - name: "Removing ara resources"
   block:
@@ -48,8 +45,7 @@
         name: ara
         state: absent
         remove: true
-
-  when: "'ara.service' in {{ ansible_facts.services }}"
+  when: "'ara.service' in ansible_facts.services"
 
 - name: Reloading Systemd
   systemd:

diff --git a/ansible/roles/sf-nodepool/defaults/main.yml b/ansible/roles/sf-nodepool/defaults/main.yml
@@ -63,14 +63,13 @@ nodepool_components:
   - service: "nodepool-builder"
     image: "quay.io/software-factory/nodepool-builder-ubi:{{ nodepool_container_version }}"
     run: >-
-      sudo
       /usr/local/bin/nodepool-builder -d
       -c /etc/nodepool/nodepool.yaml
       -s /etc/nodepool/secure.conf
       -l /etc/nodepool/builder-logging.yaml
     params: >-
       --network host
-      --user {{ container_uid }}:{{ container_gid }}
+      --user 0
       --volume /dev:/dev
       --volume /run/libvirt:/run/libvirt
       --volume /etc/nodepool/:/etc/nodepool/:z

diff --git a/ansible/roles/sf-zuul/defaults/main.yml b/ansible/roles/sf-zuul/defaults/main.yml
@@ -23,8 +23,8 @@ zuul_share_dir: "/usr/share/javascript/zuul"
 
 zuul_version: "8.1.0"
 zuul_container_version: "{{ zuul_version }}-1"
-zuul_client_version: "a6ce77acffd852219fd43a6dc61cbe637aa85bf2"
-zuul_client_container_version: "{{ zuul_client_version }}-1"
+zuul_client_version: "f96ddd00fc69d8a4d51eb207ef322b99983d1fe8"
+zuul_client_container_version: "0.1.0-{{ zuul_client_version }}-1"
 
 zuul_components_default_params: >-
   --network host