Merge pull request #386 from tapis-project/staging

Staging
tapis-project · Sep 5, 2024 · 68bdfbd · 68bdfbd
2 parents e5890fd + 6055acd
commit 68bdfbd
Show file tree

Hide file tree

Showing 27 changed files with 295 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog 
 
+## 1.6.4 
+
+### Service Updates
+
+
+- [Systems: 1.6.4 to 1.6.5 (tapis/systems)](Systems changes: https://github.com/tapis-project/tapis-systems/blob/1.6.5/CHANGELOG.md)
+- [Apps: 1.6.3 to 1.6.4 (tapis/apps)](https://github.com/tapis-project/tapis-apps/blob/1.6.4/CHANGELOG.md)
+- [Files: 1.6.3 to 1.6.4 (tapis/tapis-files, tapis/tapis-files-workers)](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md)
+- [Jobs: 1.6.3 to 1.6.4 (tapis/jobsworker, jobsmigrate, jobsapi)](https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md)
+- [Security: 1.6.2 to 1.6.3 (tapis/securitymigrate, securityadmin, securityapi, securityexport)](https://github.com/tapis-project/tapis-security/blob/dev/tapis-securityapi/CHANGELOG.md)
+- [Globus-Proxy: 1.6.2 to 1.6.4 (tapis/globus-proxy)](https://github.com/tapis-project/globus-proxy/blob/dev/CHANGELOG.md)
+
+
 ## 1.6.3 
 
 ### Service Updates

diff --git a/playbooks/roles/actors/templates/docker/actors-config.json b/playbooks/roles/actors/templates/docker/actors-config.json
@@ -6,7 +6,7 @@
   "service_name": "abaco",
   "service_password": "$env{SERVICE_PASSWORD}",
   "tenants": {{ actors_service_tenants | to_json }},
-  "version": "1.2.1",
+  "version": "1.6.0",
   "container_backend": "docker",
   "log_file": "",
   "log_level": "DEBUG",
@@ -21,8 +21,8 @@
   "mongo_replica_set": true,
   "admin_rabbitmq_user": "admin",
   "admin_rabbitmq_pass": "$env{RABBITMQ_PASSWORD}",
-  "rabbit_uri": "amqp://actors-rabbit:5672",
-  "rabbit_dash_host": "actors-rabbit-dash",
+  "rabbit_uri": "amqp://actors-rabbitmq:5672",
+  "rabbit_dash_host": "actors-rabbitmq",
   "spawner_abaco_conf_host_path": "$env{abaco_host_path}/config-local.json",
   "spawner_host_id": 0,
   "spawner_host_queues": [
@@ -62,13 +62,13 @@
     "default",
     "special"
   ],
-  "site_id": "quick",
+  "site_id": "{{ actors_service_site_id }}",
   "global_site_object": {
     "web_log_ex": 43200,
     "site_mongo_pass": "THISIsAtemP0raryPASs!",
     "site_rabbitmq_pass": "rEplac3meUSingSKplz!"
   },
-  "quick_site_object": {
+  "{{ actors_service_site_id }}_site_object": {
     "site_mongo_pass": "THISIsAtemP0raryPASs!",
     "site_rabbitmq_pass": "rEplac3meUSingSKplz!"
   },

diff --git a/playbooks/roles/actors/templates/docker/burnup b/playbooks/roles/actors/templates/docker/burnup
@@ -4,14 +4,13 @@ echo "burnup actors:"
 
 mkdir -p {{ tapisdatadir }}/actors
 mkdir -p {{ tapisdatadir }}/actors/mongo
-mkdir -p {{ tapisdatadir }}/actors/mongo/keyfile
 
 MYUID=`id -u`
 docker run -it --rm -v {{ tapisdatadir }}/actors:/actors {{ actors_util_image }} chown $MYUID /actors
 
 python3 ../admin/util/parse_skexport -c actors -d {{ tapisdatadir }}
 
-cat {{ tapisdatadir }}/actors/env | grep MONGO_INITDB_ROOT_PASSWORD | cut -d'"' -f 2 > {{ tapisdatadir }}/actors/mongo/keyfiles/metakeyfile
+cat {{ tapisdatadir }}/actors/env | grep MONGO_INITDB_ROOT_PASSWORD | cut -d'"' -f 2 > {{ tapisdatadir }}/actors/mongo/mongo-replica-set-keyfile
 
 docker compose up -d
 

diff --git a/playbooks/roles/actors/templates/docker/docker-compose.yml b/playbooks/roles/actors/templates/docker/docker-compose.yml
@@ -20,12 +20,9 @@ services:
             MONGO_REPLICA_SET_NAME: rs0
         env_file:
             - {{ tapisdatadir }}/actors/env
-        # volumes:
-        #     - ./runtime_files/certs:/data/ssl
-        #     - ./runtime_files/certs/mongo-replica-set-keyfile:/keyfiles/metakeyfile
         volumes:
             - {{ tapisdatadir }}/actors/mongo/data:/data/db
-            - {{ tapisdatadir }}/actors/mongo/keyfiles:/keyfiles
+            - {{ tapisdatadir }}/actors/mongo/mongo-replica-set-keyfile:/keyfiles/metakeyfile
         networks:
             - tapis
         ulimits:
@@ -73,10 +70,7 @@ services:
         networks:
             - tapis
         volumes:
-#             - ./config-local.json:/home/tapis/config.json
-          - "./actors-config.json:/etc/nginx/sites-enabled/flask-project"
-# #            - ./images/nginx/nginx.conf:/etc/nginx/nginx.conf
-# #            - ./images/nginx/sites-enabled:/etc/nginx/sites-enabled
+            - ./nginx.conf:/etc/nginx/conf/nginx.conf
         restart: always
         depends_on:
             actors-mongo:
@@ -85,13 +79,10 @@ services:
     actors-reg:
         container_name: actors-reg
         image: {{ actors_core_image }}
-        # ports:
-        #     - "127.0.0.1:5000:5000"
         volumes:
-        #     - ./config-local.json:/home/tapis/config.json
           - "./actors-config.json:/home/tapis/config.json"
-        #     - ./abaco.log:/home/tapis/runtime_files/logs/service.log
-        #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -111,12 +102,9 @@ services:
         container_name: actors-mes
         image: {{ actors_core_image }}
         volumes:
-        #     - ./config-local.json:/home/tapis/config.json
           - "./actors-config.json:/home/tapis/config.json"
-        #     - ./abaco.log:/home/tapis/runtime_files/logs/service.log
-        #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
-        # ports:
-        #     - "127.0.0.1:5001:5000"
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -137,12 +125,11 @@ services:
         container_name: actors-admin
         image: {{ actors_core_image }}
         volumes:
-        #     - ./config-local.json:/home/tapis/config.json
           - "./actors-config.json:/home/tapis/config.json"
-        #     - ./abaco.log:/home/tapis/runtime_files/logs/service.log
-        #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
-        ports:
-            - "127.0.0.1:5003:5000"
+        # ports:
+        #     - "127.0.0.1:5003:5000"
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -164,11 +151,9 @@ services:
         image: {{ actors_core_image }}
         command: "python3 -u /home/tapis/actors/spawner.py"
         volumes:
-        #     - ./config-local.json:/home/tapis/config.json
           - "./actors-config.json:/home/tapis/config.json"
-        #     - /var/run/docker.sock:/var/run/docker.sock
-        #     - ./abaco.log:/home/tapis/runtime_files/logs/service.log
-        #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -188,12 +173,11 @@ services:
         image: {{ actors_core_image }}
         command: /home/tapis/actors/health_check.sh
         volumes:
-            - /:/host
-        #     - ./config-local.json:/home/tapis/config.json
+            #- /:/host # I didn't put this here, I don't think neccessary
             - "./actors-config.json:/home/tapis/config.json"
             - /var/run/docker.sock:/var/run/docker.sock
-        #     - ./abaco.log:/home/tapis/runtime_files/logs/service.log
-        #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -216,11 +200,9 @@ services:
         image: {{ actors_core_image }}
         command: "python3 -u /home/tapis/actors/events.py"
         volumes:
-        #     - ./config-local.json:/home/tapis/config.json
           - "./actors-config.json:/home/tapis/config.json"
-        #     - /var/run/docker.sock:/var/run/docker.sock
-        #     - ./abaco.log:/home/tapis/runtime_files/logs/service.log
-        #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -239,17 +221,6 @@ services:
         networks:
             - tapis
 
-    actors-grafana:
-        container_name: acrots-grafana
-        image: {{ actors_grafana_image }}
-        user: "104"
-        depends_on:
-            - actors-mongo
-            - actors-reg
-        networks:
-            - tapis
-        restart: always
-
     actors-metrics:
         container_name: actors-metrics
         image: {{ actors_core_image }}
@@ -262,6 +233,8 @@ services:
         #     - ./runtime_files/certs:/home/tapis/runtime_files/certs
         # ports:
         #     - "127.0.0.1:5004:5000"
+        env_file:
+            - {{ tapisdatadir }}/actors/env
         environment:
             # abaco_host_path: ${abaco_path}
             abaco_host_path: "{{ tapisdatadir }}/actors"
@@ -276,5 +249,3 @@ services:
             - actors-mongo
             - actors-reg
 
-# volumes:
-#     grafana_data: {}