Merge remote-tracking branch 'origin/328_podman_minio_localstack_rewr…

…ite' into 243_rocky_9

tasks/localstack.yml

@@ -1,10 +1,33 @@
 ---
 
-- ansible.builtin.import_tasks: docker.yml
+- ansible.builtin.import_tasks: podman.yml
 
 - ansible.builtin.import_tasks: aws_cli.yml
 
-- ansible.builtin.import_tasks: aws_config.yml
+- name: create localstack user
+  ansible.builtin.user:
+    name: '{{ localstack.user }}'
+
+- name: ensure dot dir exists
+  file:
+    path: '~{{ localstack.user }}/.aws'
+    state: directory
+    owner: '{{ localstack.user }}'
+    mode: '0700'
+
+- name: place localstack aws credentials
+  template:
+    src: localstack_aws_credentials.j2
+    dest: '~{{ localstack.user }}/.aws/credentials'
+    owner: '{{ localstack.user }}'
+    mode: '0600'
+
+- name: place localstack aws config
+  template:
+    src: localstack_aws_config.j2
+    dest: '~{{ localstack.user }}/.aws/config'
+    owner: '{{ localstack.user }}'
+    mode: '0600'
 
 # so we can run localstack task stand-alone
 - ansible.builtin.import_tasks: dataverse-fqdn.yml
@@ -17,19 +40,19 @@
 - name: place docker-compose.yml template
   ansible.builtin.template:
     src: localstack-compose.yml.j2
-    dest: '~{{ dataverse.payara.user }}/localstack-compose.yml'
+    dest: '~{{ localstack.user }}/localstack-compose.yml'
+    owner: '{{ localstack.user }}'
 
 - name: ensure DATA_DIR exists
   ansible.builtin.file:
     path: '{{ localstack.data_dir }}'
     state: directory
-    owner: '{{ dataverse.payara.user }}'
-    group: '{{ dataverse.payara.group }}'
+    owner: '{{ localstack.user }}'
     mode: 0755
 
-- name: start s3-test container
-  ansible.builtin.shell: 'docker compose -f localstack-compose.yml up -d'
+- name: start localstack s3 container
+  ansible.builtin.shell: 'podman-compose -f localstack-compose.yml up -d'
   become: true
-  become_user: '{{ dataverse.payara.user }}'
+  become_user: '{{ localstack.user }}'
   args:
-    chdir: '~{{ dataverse.payara.user }}'
+    chdir: '~{{ localstack.user }}'

tasks/localstack_create_bucket.yml

@@ -7,7 +7,7 @@
 - name: create localstack bucket for testing
   ansible.builtin.shell: "aws --endpoint={{ custom_endpoint_escaped }} s3 mb s3://{{ bucket_options.bucket_name }}"
   become: yes
-  become_user: "{{ dataverse.payara.user }}"
+  become_user: "{{ localstack.user }}"
   when: bucket_options.custom_endpoint_url | length > 0
 
 - name: place CORS.json
@@ -21,7 +21,7 @@
 - name: set CORS on bucket when upload_redirect is true
   ansible.builtin.shell: 'aws --endpoint={{ custom_endpoint_escaped }} s3api put-bucket-cors --bucket {{ bucket_options.bucket_name }} --cors-configuration file:///tmp/cors.json'
   become: yes
-  become_user: "{{ dataverse.payara.user }}"
+  become_user: "{{ localstack.user }}"
   when: bucket_options.upload_redirect == true
 
 - name: debug

tasks/minio.yml

@@ -1,6 +1,10 @@
 ---
 
-- ansible.builtin.import_tasks: docker.yml
+- ansible.builtin.import_tasks: podman.yml
+
+- name: ensure minio service account exists
+  ansible.builtin.user:
+    name: '{{ minio.user }}'
 
 - name: STORAGE | Import assert.yml
   ansible.builtin.import_tasks: minio_assert.yml
@@ -33,8 +37,7 @@
       ansible.builtin.file:
         path: "{{ minio.docker.project_location }}/data"
         state: directory
-        owner: '{{ dataverse.payara.user }}'
-        group: '{{ dataverse.payara.group }}'
+        owner: '{{ minio.user }}'
         mode: "0755"
         recurse: true
       when:
@@ -45,8 +48,7 @@
       ansible.builtin.template:
         src: minio_compose.j2
         dest: "{{ minio.docker.project_location }}/minio_compose.yml"
-        owner: '{{ dataverse.payara.user }}'
-        group: '{{ dataverse.payara.group }}'
+        owner: '{{ minio.user }}'
         mode: "0644"
         lstrip_blocks: true
         force: true

tasks/podman.yml

@@ -0,0 +1,6 @@
+---
+
+- name: install podman
+  ansible.builtin.package:
+    name: ['podman','podman-compose','podman-docker']
+    state: latest

templates/localstack_aws_config.j2

@@ -0,0 +1,2 @@
+[default]
+region = {{ localstack.region }}

templates/localstack_aws_credentials.j2

@@ -0,0 +1,3 @@
+[default]
+aws_access_key_id = {{ localstack.access_key }}
+aws_secret_access_key = {{ localstack.secret_access_key }}

tests/group_vars/jenkins.yml

@@ -304,11 +304,15 @@ java:
 localstack:
   enabled: true
   container_name: dev_localstack
+  access_key: 4cc355_k3y
+  secret_access_key: s3cr3t_4cc355_k3y
+  region: us-east-2
   # set to /tmp/localstack/data to enable persistence
   data_dir: /tmp/localstack/data
   debug: true
   hostname_external: localstack
   port: 4566
+  user: localstack
   web_ui: 8888
   buckets:
     - label: LocalStack
@@ -336,13 +340,14 @@ maven:
 
 minio:
   enabled: true
+  user: minio
   docker:
     version: "latest"
     service_name: "minio"
     network:
       name: "minio"
       external: false
-    project_location: "/home/dataverse/minio"
+    project_location: "/home/minio/minio"
     timezone: "America/New_York"
     user: dataverse
     group: dataverse