Merge branch 'deployment/test' of https://github.com/stackhpc/reductionist-rs into deployment/test

Author: maxstack

deployment/group_vars/all

@@ -5,6 +5,11 @@ reductionist_build_image: true
 reductionist_src_url: "http://github.com/stackhpc/reductionist-rs"
 # Source version.
 reductionist_src_version: "deployment/test"
+# Location for the repo
+reductionist_repo_location: "{{ ansible_facts.env.HOME }}/reductionist-rs"
+# Whether to clone and checkout,
+# use this to disable the checkout and use an existing repo with local modifications.
+reductionist_clone_repo: "true"
 # Container name.
 reductionist_name: "reductionist"
 # Container image name.
@@ -19,10 +24,10 @@ reductionist_networks:
 reductionist_env:
   OTEL_EXPORTER_JAEGER_AGENT_HOST: "{{ hostvars[(groups['jaeger'] | default([]) + [inventory_hostname])[0]].ansible_facts.default_ipv4.address }}"
   REDUCTIONIST_ENABLE_JAEGER: "{{ (groups['jaeger'] | default([]) | length > 0) | string | lower }}"
-  REDUCTIONIST_HTTPS: "true"
-  REDUCTIONIST_PORT: "8081"
+  REDUCTIONIST_HTTPS: "false"
+  REDUCTIONIST_PORT: "8080"
   REDUCTIONIST_USE_CHUNK_CACHE: "true"
-  REDUCTIONIST_CHUNK_CACHE_PATH: "/mnt/localdisk/mnorton/"
+  REDUCTIONIST_CHUNK_CACHE_PATH: "/cache"
   REDUCTIONIST_CHUNK_CACHE_AGE: "86400"
   REDUCTIONIST_CHUNK_CACHE_PRUNE_INTERVAL: "3600"
   REDUCTIONIST_CHUNK_CACHE_SIZE_LIMIT: "10GB"
@@ -31,9 +36,14 @@ reductionist_env:
 reductionist_remote_certs_path: "{{ ansible_facts.env.HOME }}/certs"
 # Path to certificates directory in container.
 reductionist_container_certs_path: "/root/.config/reductionist/certs"
+# Path to cache directory on remote host.
+reductionist_remote_cache_path: "{{ ansible_facts.env.HOME }}/cache"
+# Path to certificates directory in container.
+reductionist_container_cache_path: "/cache"
 # List of container volume mounts.
 reductionist_volumes:
   - "{{ reductionist_remote_certs_path }}:{{ reductionist_container_certs_path }}"
+  - "{{ reductionist_remote_cache_path }}:{{ reductionist_container_cache_path }}"
 # Host on which HAProxy frontend is exposed.
 reductionist_host: "{{ hostvars[groups['haproxy'][0]].ansible_facts.default_ipv4.address }}"
 # Certificate validity.

deployment/site.yml

@@ -373,15 +373,15 @@
     - name: Clone reductionist repo
       ansible.builtin.git:
         repo: "{{ reductionist_src_url }}"
-        dest: "{{ ansible_env.HOME }}/reductionist-rs"
+        dest: "{{ reductionist_repo_location }}"
         version: "{{ reductionist_src_version }}"
-      when: reductionist_build_image | bool
+      when: reductionist_build_image | bool and reductionist_clone_repo | bool
 
     - name: Ensure reductionist image is built
       containers.podman.podman_image:
         name: "{{ reductionist_image }}"
         tag: "{{ reductionist_tag }}"
-        path: "{{ ansible_env.HOME }}/reductionist-rs"
+        path: "{{ reductionist_repo_location }}"
       when: reductionist_build_image | bool
 
     - name: Ensure reductionist container is running