diff --git a/CHANGELOG.md b/CHANGELOG.md index 2046bd43..36249633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## 1.6.3 + +### Service Updates + +- [Authenticator: 1.6.1 to 1.6.2 (tapis/authenticator, tapis/authenticator-migrations)](https://github.com/tapis-project/authenticator/blob/staging/CHANGELOG.md) +- [Systems: 1.6.2 to 1.6.3 (tapis/systems)](https://github.com/tapis-project/tapis-systems/blob/1.6.3/CHANGELOG.md) +- [Files: 1.6.2 to 1.6.3 (tapis/tapis-files, tapis/tapis-files-workers)](https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md) +- [Jobs: 1.6.2 to 1.6.3 (tapis/jobsworker, jobsmigrate, jobsapi)](https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md) +- [Globus-Proxy: 1.6.0 to 1.6.2 (tapis/globus-proxy)](https://github.com/tapis-project/globus-proxy/blob/dev/CHANGELOG.md) +- Removed Monitoring-Kibana & Monitoring-Elasticsearch components. These may be left in burndown scripts for now but will be removed in a future release. + ## 1.6.2 ### Service Updates diff --git a/playbooks/roles/actors/templates/docker/burnup b/playbooks/roles/actors/templates/docker/burnup index 1202c256..de2d2d4b 100755 --- a/playbooks/roles/actors/templates/docker/burnup +++ b/playbooks/roles/actors/templates/docker/burnup @@ -3,9 +3,16 @@ 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 + docker compose up -d + + diff --git a/playbooks/roles/actors/templates/docker/docker-compose.yml b/playbooks/roles/actors/templates/docker/docker-compose.yml index bd0961ee..2e0737e5 100644 --- a/playbooks/roles/actors/templates/docker/docker-compose.yml +++ b/playbooks/roles/actors/templates/docker/docker-compose.yml @@ -16,8 +16,8 @@ services: container_name: actors-mongo image: {{ actors_mongo_image }} environment: - - MONGO_INITDB_ROOT_USERNAME: admin - - MONGO_REPLICA_SET_NAME: rs0 + MONGO_INITDB_ROOT_USERNAME: admin + MONGO_REPLICA_SET_NAME: rs0 env_file: - {{ tapisdatadir }}/actors/env # volumes: @@ -25,7 +25,7 @@ services: # - ./runtime_files/certs/mongo-replica-set-keyfile:/keyfiles/metakeyfile volumes: - {{ tapisdatadir }}/actors/mongo/data:/data/db - - {{ tapisdatadir }}/actors/mongo/keyfile:keyfile-base + - {{ tapisdatadir }}/actors/mongo/keyfiles:/keyfiles networks: - tapis ulimits: @@ -160,7 +160,7 @@ services: - tapis actors-spawner: - contianer_name: actors-spawner + container_name: actors-spawner image: {{ actors_core_image }} command: "python3 -u /home/tapis/actors/spawner.py" volumes: diff --git a/playbooks/roles/admin/templates/docker/util/parse_skexport b/playbooks/roles/admin/templates/docker/util/parse_skexport index 5b99d44a..1b5e226f 100644 --- a/playbooks/roles/admin/templates/docker/util/parse_skexport +++ b/playbooks/roles/admin/templates/docker/util/parse_skexport @@ -10,7 +10,7 @@ import json actors = { "RABBITMQ_DEFAULT_PASS":"DBCREDENTIAL_RABBITMQ_ABACO_RABBIT_MQ_HOST_RABBITMQ_ABACO_PASSWORD", "MONGO_INITDB_ROOT_PASSWORD": "DBCREDENTIAL_MONGO_ABACO_MONGO_DB_HOST_MONGODB_ABACO_PASSWORD", - "": "SERVICEPWD_ABACO_PASSWORD" + "SERVICEPWD_ABACO_PASSWORD": "SERVICEPWD_ABACO_PASSWORD" } apps = { @@ -105,8 +105,8 @@ skadmin = {"":""} streams = { "influxdb_password": "DBCREDENTIAL_INFLUX_INFLUX_HOST_CHORDS_TS_PRODUCTION_ADMIN_PASSWORD", - "INFLUXDB_PASSWORD": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", - "INFLUXDB_ADMIN_PW": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", + "INFLUXDB_PASSWORD": "DBCREDENTIAL_INFLUX_INFLUX_HOST_CHORDS_TS_PRODUCTION_ADMIN_PASSWORD", + "INFLUXDB_ADMIN_PW": "DBCREDENTIAL_INFLUX_INFLUX_HOST_CHORDS_TS_PRODUCTION_ADMIN_PASSWORD", "mysql_password": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", "mysql-password": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", "MYSQL_PASSWORD": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", @@ -118,7 +118,7 @@ streams = { "service-password": "SERVICEPWD_STREAMS_PASSWORD", "service_password": "SERVICEPWD_STREAMS_PASSWORD", "CHORDS_ADMIN_PW": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", - "INFLUXDB_ADMIN_PW": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", + "INFLUXDB_ADMIN_PW": "DBCREDENTIAL_INFLUX_INFLUX_HOST_CHORDS_TS_PRODUCTION_ADMIN_PASSWORD", "MYSQL_PASSWORD": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD", "CHORDS_MYSQL_PASSWORD": "DBCREDENTIAL_MYSQL_MYSQL_HOST_CHORDS_SEEDED_PRODUCTION_ADMIN_PASSWORD" } diff --git a/playbooks/roles/apps/templates/docker/burndown b/playbooks/roles/apps/templates/docker/burndown index 18c1e2ab..90957904 100755 --- a/playbooks/roles/apps/templates/docker/burndown +++ b/playbooks/roles/apps/templates/docker/burndown @@ -2,6 +2,4 @@ echo "burndown apps:" -export UID_GID="$(id -u):$(id -g)" - docker compose down diff --git a/playbooks/roles/apps/templates/docker/burnup b/playbooks/roles/apps/templates/docker/burnup index cc3df1bd..1db1f19b 100755 --- a/playbooks/roles/apps/templates/docker/burnup +++ b/playbooks/roles/apps/templates/docker/burnup @@ -5,12 +5,6 @@ echo "burnup apps:" mkdir -p {{ tapisdatadir }}/apps mkdir -p {{ tapisdatadir }}/apps/postgres -MYUID=`id -u` - -export UID_GID="$(id -u):$(id -g)" - -docker run -it --rm -v {{ tapisdatadir }}/apps:/apps {{ apps_util_image }} chown $MYUID /apps - python3 ../admin/util/parse_skexport -c apps -d {{ tapisdatadir }} docker compose up -d diff --git a/playbooks/roles/apps/templates/docker/docker-compose.yml b/playbooks/roles/apps/templates/docker/docker-compose.yml index 5cb1a63c..cc58ff39 100644 --- a/playbooks/roles/apps/templates/docker/docker-compose.yml +++ b/playbooks/roles/apps/templates/docker/docker-compose.yml @@ -7,7 +7,6 @@ networks: services: apps-api: container_name: apps-api - user: ${UID_GID} image: {{ apps_api_image }} networks: - tapis diff --git a/playbooks/roles/authenticator/defaults/main/images.yml b/playbooks/roles/authenticator/defaults/main/images.yml index b097d114..7d00756d 100644 --- a/playbooks/roles/authenticator/defaults/main/images.yml +++ b/playbooks/roles/authenticator/defaults/main/images.yml @@ -1,4 +1,4 @@ -authenticator_api_image: tapis/authenticator:1.6.1 -authenticator_migrations_image: tapis/authenticator-migrations:1.6.1 +authenticator_api_image: tapis/authenticator:1.6.2 +authenticator_migrations_image: tapis/authenticator-migrations:1.6.2 authenticator_postgres_image: postgres:11.4 authenticator_ldap_image: tacc/slapd:1 diff --git a/playbooks/roles/baseburnup/defaults/main/vars.yml b/playbooks/roles/baseburnup/defaults/main/vars.yml index aa297ae3..fce8fe10 100644 --- a/playbooks/roles/baseburnup/defaults/main/vars.yml +++ b/playbooks/roles/baseburnup/defaults/main/vars.yml @@ -1,4 +1,4 @@ -baseburnup_tapis_deployer_version: 1.6.2 +baseburnup_tapis_deployer_version: 1.6.3 baseburnup_service_url: "{{ global_service_url }}" baseburnup_vault_url: "{{ global_vault_url }}" diff --git a/playbooks/roles/baseburnup/templates/docker/burndown b/playbooks/roles/baseburnup/templates/docker/burndown index 7f8ac430..4b42035f 100755 --- a/playbooks/roles/baseburnup/templates/docker/burndown +++ b/playbooks/roles/baseburnup/templates/docker/burndown @@ -22,10 +22,22 @@ echo "Start: top-level-burndown" # actors +{% if "actors" in components_to_deploy %} +cd $mydir_absolute/actors +./burndown +{% endif %} + + # container-registry # globus-proxy +{% if "globus-proxy" in components_to_deploy %} +cd $mydir_absolute/globus-proxy +./burndown +{% endif %} + + {% if "meta" in components_to_deploy %} cd $mydir_absolute/meta ./burndown diff --git a/playbooks/roles/baseburnup/templates/docker/burnup b/playbooks/roles/baseburnup/templates/docker/burnup index d398924b..b172827e 100755 --- a/playbooks/roles/baseburnup/templates/docker/burnup +++ b/playbooks/roles/baseburnup/templates/docker/burnup @@ -99,12 +99,18 @@ burnup_or_exit apps ## tertiary services -# actors +{% if "actors" in components_to_deploy %} +burnup_or_exit actors +{% endif %} # container-registry # globus-proxy +{% if "globus-proxy" in components_to_deploy %} +burnup_or_exit globus-proxy +{% endif %} + {% if "meta" in components_to_deploy %} burnup_or_exit meta {% endif %} diff --git a/playbooks/roles/files/defaults/main/images.yml b/playbooks/roles/files/defaults/main/images.yml index ef9cb0dc..9d5ae39b 100644 --- a/playbooks/roles/files/defaults/main/images.yml +++ b/playbooks/roles/files/defaults/main/images.yml @@ -1,5 +1,5 @@ -files_api_image: tapis/tapis-files:1.6.2 -files_workers_image: tapis/tapis-files-workers:1.6.2 +files_api_image: tapis/tapis-files:1.6.3 +files_workers_image: tapis/tapis-files-workers:1.6.3 files_postgres_image: postgres:11 files_migrations_image: postgres:11 files_minio_image: minio/minio diff --git a/playbooks/roles/files/templates/docker/burndown b/playbooks/roles/files/templates/docker/burndown index f13b0939..467b256e 100755 --- a/playbooks/roles/files/templates/docker/burndown +++ b/playbooks/roles/files/templates/docker/burndown @@ -2,6 +2,4 @@ echo "burndown files:" -export UID_GID="$(id -u):$(id -g)" - docker compose down diff --git a/playbooks/roles/files/templates/docker/burnup b/playbooks/roles/files/templates/docker/burnup index fbadfd92..92967e1f 100755 --- a/playbooks/roles/files/templates/docker/burnup +++ b/playbooks/roles/files/templates/docker/burnup @@ -8,12 +8,6 @@ mkdir -p {{ tapisdatadir }}/files/postgres mkdir -p {{ tapisdatadir }}/files/minio mkdir -p {{ tapisdatadir }}/files/irods -MYUID=`id -u` - -export UID_GID="$(id -u):$(id -g)" - -docker run -it --rm -v {{ tapisdatadir }}/files:/files {{ files_util_image }} chown $MYUID /files - python3 ../admin/util/parse_skexport -c files -d {{ tapisdatadir }} docker compose up -d diff --git a/playbooks/roles/files/templates/docker/docker-compose.yml b/playbooks/roles/files/templates/docker/docker-compose.yml index 6077be47..05c487ca 100644 --- a/playbooks/roles/files/templates/docker/docker-compose.yml +++ b/playbooks/roles/files/templates/docker/docker-compose.yml @@ -69,7 +69,6 @@ services: files-workers: container_name: files-workers - user: ${UID_GID} image: {{ files_workers_image }} networks: - tapis @@ -97,7 +96,6 @@ services: condition: service_started files-api: - user: ${UID_GID} container_name: files-api image: {{ files_api_image }} networks: diff --git a/playbooks/roles/globus-proxy/defaults/main/images.yml b/playbooks/roles/globus-proxy/defaults/main/images.yml index 0d05dcad..46ae5867 100644 --- a/playbooks/roles/globus-proxy/defaults/main/images.yml +++ b/playbooks/roles/globus-proxy/defaults/main/images.yml @@ -1 +1 @@ -globus_proxy_api_image: tapis/globus-proxy:1.6.1 +globus_proxy_api_image: tapis/globus-proxy:1.6.2 diff --git a/playbooks/roles/jobs/defaults/main/images.yml b/playbooks/roles/jobs/defaults/main/images.yml index 63ec3cec..0154112c 100644 --- a/playbooks/roles/jobs/defaults/main/images.yml +++ b/playbooks/roles/jobs/defaults/main/images.yml @@ -1,6 +1,6 @@ -jobs_api_image: tapis/jobsapi:1.6.2 -jobs_migrations_image: tapis/jobsmigrate:1.6.2 -jobs_worker_image: tapis/jobsworker:1.6.2 +jobs_api_image: tapis/jobsapi:1.6.3 +jobs_migrations_image: tapis/jobsmigrate:1.6.3 +jobs_worker_image: tapis/jobsworker:1.6.3 jobs_postgres_image: postgres:12.4 jobs_pgadmin_image: dpage/pgadmin4:6.20 jobs_rabbitmq_management_image: rabbitmq:3.8.11-management diff --git a/playbooks/roles/jobs/templates/docker/burndown b/playbooks/roles/jobs/templates/docker/burndown index 630c62e2..c7394fef 100755 --- a/playbooks/roles/jobs/templates/docker/burndown +++ b/playbooks/roles/jobs/templates/docker/burndown @@ -2,6 +2,4 @@ echo "burndown jobs:" -export UID_GID="$(id -u):$(id -g)" - docker compose down diff --git a/playbooks/roles/jobs/templates/docker/burnup b/playbooks/roles/jobs/templates/docker/burnup index 7c535223..3d51d9cc 100755 --- a/playbooks/roles/jobs/templates/docker/burnup +++ b/playbooks/roles/jobs/templates/docker/burnup @@ -5,11 +5,6 @@ echo "burnup jobs:" mkdir -p {{ tapisdatadir }}/jobs mkdir -p {{ tapisdatadir }}/jobs/postgres -export MYUID="$(id -u)" -export UID_GID="$(id -u):$(id -g)" - -docker run -it --rm -v {{ tapisdatadir }}/jobs:/jobs {{ jobs_util_image }} chown $MYUID /jobs - python3 ../admin/util/parse_skexport -c jobs -d {{ tapisdatadir }} docker compose up -d diff --git a/playbooks/roles/jobs/templates/docker/docker-compose.yml b/playbooks/roles/jobs/templates/docker/docker-compose.yml index dba722ee..ba5bc380 100644 --- a/playbooks/roles/jobs/templates/docker/docker-compose.yml +++ b/playbooks/roles/jobs/templates/docker/docker-compose.yml @@ -8,7 +8,6 @@ networks: services: jobs-api: container_name: jobs-api - user: ${UID_GID} networks: - tapis image: {{ jobs_api_image }} @@ -96,7 +95,6 @@ services: test: rabbitmq-diagnostics -q ping jobs-altqueue: - user: ${UID_GID} container_name: jobs-altqueue image: {{ jobs_worker_image }} networks: @@ -124,7 +122,6 @@ services: jobs-recovery: container_name: jobs-recovery - user: ${UID_GID} image: {{ jobs_worker_image }} environment: - TAPIS_SITE_ID={{ jobs_service_site_id }} @@ -151,7 +148,6 @@ services: jobs-deadletter: container_name: jobs-deadletter - user: ${UID_GID} image: {{ jobs_worker_image }} environment: - TAPIS_SITE_ID={{ jobs_service_site_id }} @@ -178,7 +174,6 @@ services: jobs-eventqueue: container_name: jobs-eventqueue - user: ${UID_GID} image: {{ jobs_worker_image }} environment: - TAPIS_SITE_ID={{ jobs_service_site_id }} @@ -205,7 +200,6 @@ services: jobs-workers: container_name: jobs-workers - user: ${UID_GID} image: {{ jobs_worker_image }} environment: {% if jobs_node_name == true %} diff --git a/playbooks/roles/meta/templates/docker/burnup b/playbooks/roles/meta/templates/docker/burnup index af6d5aa1..acb1fbc6 100755 --- a/playbooks/roles/meta/templates/docker/burnup +++ b/playbooks/roles/meta/templates/docker/burnup @@ -4,11 +4,6 @@ echo "burnup meta:" mkdir -p {{ tapisdatadir }}/meta/mongodb/data -export MYUID="$(id -u)" -export UID_GID="$(id -u):$(id -g)" - -docker run -it --rm -v {{ tapisdatadir }}/meta:/meta {{ meta_util_image }} chown $MYUID /meta - python3 ../admin/util/parse_skexport -c meta -d {{ tapisdatadir }} docker compose up -d diff --git a/playbooks/roles/monitoring/templates/docker/docker-compose.yml b/playbooks/roles/monitoring/templates/docker/docker-compose.yml index 22d27b5d..78ea759e 100644 --- a/playbooks/roles/monitoring/templates/docker/docker-compose.yml +++ b/playbooks/roles/monitoring/templates/docker/docker-compose.yml @@ -6,21 +6,6 @@ networks: services: - monitoring-elasticsearch: - container_name: monitoring-elasticsearch - image: {{ monitoring_elasticsearch_image }} - networks: - - tapis - env_file: - - {{ tapisdatadir }}/monitoring/env - environment: - - discovery.type=single-node - - search.max_buckets=65535 - - ES_JAVA_OPTS=-Xmx8G -Xmx8G -Dlog4j2.formatMsgNoLookups=true - - xpack.security.enabled=false - - cluster.routing.allocation.disk.watermark.enable_for_single_data_node=true - volumes: - - {{ tapisdatadir}}/monitoring/elasticsearch/data:/usr/share/elasticsearch/data monitoring-grafana: container_name: monitoring-grafana @@ -40,17 +25,6 @@ services: - ./prometheus-datasources.yml:/etc/grafana/provisioning/datasources/prometheus.yaml user: "0" - monitoring-kibana: - container_name: monitoring-kibana - image: {{ monitoring_kibana_image }} - env_file: - - {{ tapisdatadir }}/monitoring/env - networks: - - tapis - environment: - - ELASTICSEARCH_HOSTS=http://monitoring-elasticsearch:9200 - - ELASTICSEARCH_URL=http://monitoring-elasticsearch:9200 - monitoring-prometheus: container_name: monitoring-prometheus image: {{ monitoring_prometheus_image }} diff --git a/playbooks/roles/monitoring/templates/kube/apps/elasticsearch.yml b/playbooks/roles/monitoring/templates/kube/apps/elasticsearch.yml deleted file mode 100644 index f799b9df..00000000 --- a/playbooks/roles/monitoring/templates/kube/apps/elasticsearch.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: monitoring-elasticsearch -spec: - replicas: 1 - selector: - matchLabels: - app: monitoring-elasticsearch - template: - metadata: - labels: - app: monitoring-elasticsearch - spec: - containers: - - name: monitoring-elasticsearch - image: {{ monitoring_elasticsearch_image }} - ports: - - name: el1 - containerPort: 9200 - - name: el2 - containerPort: 9300 - env: - - name: discovery.type - value: single-node - - name: search.max_buckets - value: "65535" - - name: ES_JAVA_OPTS - value: "-Xmx8G -Xmx8G -Dlog4j2.formatMsgNoLookups=true" - - name: xpack.security.enabled - value: "false" - - name: cluster.routing.allocation.disk.watermark.enable_for_single_data_node - value: "true" - volumeMounts: - - name: elasticsearch-data - mountPath: /usr/share/elasticsearch/data - volumes: - - name: elasticsearch-data - persistentVolumeClaim: - claimName: {{monitoring_service_elasticsearch_pvc}} diff --git a/playbooks/roles/monitoring/templates/kube/apps/kibana.yml b/playbooks/roles/monitoring/templates/kube/apps/kibana.yml deleted file mode 100644 index 31d89cbb..00000000 --- a/playbooks/roles/monitoring/templates/kube/apps/kibana.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: monitoring-kibana -spec: - replicas: 1 - selector: - matchLabels: - app: monitoring-kibana - template: - metadata: - labels: - app: monitoring-kibana - spec: - containers: - - name: monitoring-kibana - image: {{ monitoring_kibana_image }} - ports: - - containerPort: 5601 - env: - - name: ELASTICSEARCH_HOSTS - value: "http://monitoring-elasticsearch:9200" - - name: ELASTICSEARCH_URL - value: "http://monitoring-elasticsearch:9200" - diff --git a/playbooks/roles/monitoring/templates/kube/burndown b/playbooks/roles/monitoring/templates/kube/burndown index 2dceabd7..61854d1f 100755 --- a/playbooks/roles/monitoring/templates/kube/burndown +++ b/playbooks/roles/monitoring/templates/kube/burndown @@ -14,4 +14,8 @@ kubectl delete -f apps kubectl delete -f stern-fluentd #Jobs - kubectl delete -f monitor-init-user.yml +kubectl delete -f monitor-init-user.yml + +# 1.6.3 Removed elasticsearch & kibana from install. Putting these here to shut down existing. +kubectl delete deploy/monitoring-elasticsearch +kubectl delete deploy/monitoring-kibana diff --git a/playbooks/roles/notifications/templates/docker/burndown b/playbooks/roles/notifications/templates/docker/burndown index 672b1c5e..83896489 100755 --- a/playbooks/roles/notifications/templates/docker/burndown +++ b/playbooks/roles/notifications/templates/docker/burndown @@ -2,6 +2,6 @@ echo "burndown meta:" -export UID_GID="$(id -u):$(id -g)" +#export UID_GID="$(id -u):$(id -g)" docker compose down diff --git a/playbooks/roles/notifications/templates/docker/burnup b/playbooks/roles/notifications/templates/docker/burnup index 887aab51..8542380a 100755 --- a/playbooks/roles/notifications/templates/docker/burnup +++ b/playbooks/roles/notifications/templates/docker/burnup @@ -5,11 +5,6 @@ echo "burnup notifications:" mkdir -p {{ tapisdatadir }}/notifications mkdir -p {{ tapisdatadir }}/notifications/postgres -MYUID=`id -u` -export UID_GID="$(id -u):$(id -g)" - -docker run -it --rm -v {{ tapisdatadir }}/notifications:/notifications {{ notifications_util_image }} chown $MYUID /notifications - python3 ../admin/util/parse_skexport -c notifications -d {{ tapisdatadir }} docker compose up -d diff --git a/playbooks/roles/notifications/templates/docker/docker-compose.yml b/playbooks/roles/notifications/templates/docker/docker-compose.yml index f1733869..d225cabc 100644 --- a/playbooks/roles/notifications/templates/docker/docker-compose.yml +++ b/playbooks/roles/notifications/templates/docker/docker-compose.yml @@ -9,7 +9,6 @@ services: notifications-api: container_name: notifications-api - user: ${UID_GID} image: {{ notifications_api_image }} environment: - TAPIS_SITE_ID={{ notifications_service_site_id }} @@ -79,7 +78,6 @@ services: notifications-dispatcher: container_name: notifications-dispatcher - user: ${UID_GID} image: {{ notifications_dispatcher_image }} environment: - TAPIS_SITE_ID={{ notifications_service_site_id }} diff --git a/playbooks/roles/security/templates/docker/burndown b/playbooks/roles/security/templates/docker/burndown index 1bd6f34a..d9d63b68 100755 --- a/playbooks/roles/security/templates/docker/burndown +++ b/playbooks/roles/security/templates/docker/burndown @@ -2,7 +2,5 @@ echo "burndown security:" -export UID_GID="$(id -u):$(id -g)" - docker compose down diff --git a/playbooks/roles/security/templates/docker/burnup b/playbooks/roles/security/templates/docker/burnup index 1e15a801..af849af0 100755 --- a/playbooks/roles/security/templates/docker/burnup +++ b/playbooks/roles/security/templates/docker/burnup @@ -7,8 +7,5 @@ mkdir -p {{ tapisdatadir }}/security/postgres python3 ../admin/util/parse_skexport -c security -d {{ tapisdatadir }} -export UID_GID="$(id -u):$(id -g)" -docker run -it --rm -v {{ tapisdatadir }}/security:/security {{ security_util_image }} chown $UID_GID /security - docker compose up -d diff --git a/playbooks/roles/security/templates/docker/docker-compose.yml b/playbooks/roles/security/templates/docker/docker-compose.yml index 32463e13..7ab6772a 100644 --- a/playbooks/roles/security/templates/docker/docker-compose.yml +++ b/playbooks/roles/security/templates/docker/docker-compose.yml @@ -50,7 +50,6 @@ services: security-api: container_name: security-api - user: ${UID_GID} image: {{ security_api_image }} environment: - TAPIS_SITE_ID={{ security_service_site_id }} diff --git a/playbooks/roles/streams/templates/docker/docker-compose.yml b/playbooks/roles/streams/templates/docker/docker-compose.yml index b2a55da6..5b09ee42 100644 --- a/playbooks/roles/streams/templates/docker/docker-compose.yml +++ b/playbooks/roles/streams/templates/docker/docker-compose.yml @@ -89,7 +89,6 @@ services: environment: - MYSQL_ALLOW_EMPTY_PASSWORD=1 - MYSQL_USER=chords_demo_user - - MYSQL_DATABASE=CHORDS_SEEDED_production env_file: - {{ tapisdatadir }}/streams/env logging: diff --git a/playbooks/roles/systems/defaults/main/images.yml b/playbooks/roles/systems/defaults/main/images.yml index 72969c20..364dc8af 100644 --- a/playbooks/roles/systems/defaults/main/images.yml +++ b/playbooks/roles/systems/defaults/main/images.yml @@ -1,4 +1,4 @@ systems_pgadmin_image: dpage/pgadmin4:6.20 systems_postgres_image: postgres:12.4 systems_util_image: tapis/ubutil2204:1.6.1 -systems_api_image: tapis/systems:1.6.2 +systems_api_image: tapis/systems:1.6.3 diff --git a/playbooks/roles/systems/templates/docker/burndown b/playbooks/roles/systems/templates/docker/burndown index 9dbb8244..9cad4b63 100755 --- a/playbooks/roles/systems/templates/docker/burndown +++ b/playbooks/roles/systems/templates/docker/burndown @@ -2,6 +2,6 @@ echo "burndown systems:" -export UID_GID="$(id -u):$(id -g)" +#export UID_GID="$(id -u):$(id -g)" docker compose down diff --git a/playbooks/roles/systems/templates/docker/burnup b/playbooks/roles/systems/templates/docker/burnup index d636258c..b17b0c3f 100755 --- a/playbooks/roles/systems/templates/docker/burnup +++ b/playbooks/roles/systems/templates/docker/burnup @@ -5,10 +5,10 @@ echo "burnup systems:" mkdir -p {{ tapisdatadir }}/systems mkdir -p {{ tapisdatadir }}/systems/postgres -MYUID=`id -u` -docker run -it --rm -v {{ tapisdatadir }}/systems:/systems {{ systems_util_image }} chown $MYUID /systems +#MYUID=`id -u` +#docker run -it --rm -v {{ tapisdatadir }}/systems:/systems {{ systems_util_image }} chown $MYUID /systems -export UID_GID="$(id -u):$(id -g)" +#export UID_GID="$(id -u):$(id -g)" python3 ../admin/util/parse_skexport -c systems -d {{ tapisdatadir }} diff --git a/playbooks/roles/systems/templates/docker/docker-compose.yml b/playbooks/roles/systems/templates/docker/docker-compose.yml index a85f1bcc..cfd6c571 100644 --- a/playbooks/roles/systems/templates/docker/docker-compose.yml +++ b/playbooks/roles/systems/templates/docker/docker-compose.yml @@ -6,7 +6,6 @@ networks: services: systems-api: container_name: systems-api - user: ${UID_GID} image: {{ systems_api_image }} networks: - tapis diff --git a/playbooks/roles/tenants/templates/docker/docker-compose.yml b/playbooks/roles/tenants/templates/docker/docker-compose.yml index 797ded02..0252e52d 100644 --- a/playbooks/roles/tenants/templates/docker/docker-compose.yml +++ b/playbooks/roles/tenants/templates/docker/docker-compose.yml @@ -47,9 +47,7 @@ services: container_name: tenants-api image: {{ tenants_api_image }} volumes: - # - ./service.log:/home/tapis/service.log - ./tenants-config.json:/home/tapis/config.json - - ./tenants-service.log:/home/tapis/service.log networks: - tapis environment: diff --git a/playbooks/roles/test-resources/templates/docker/burndown b/playbooks/roles/test-resources/templates/docker/burndown index 36dfa231..e09a4b68 100755 --- a/playbooks/roles/test-resources/templates/docker/burndown +++ b/playbooks/roles/test-resources/templates/docker/burndown @@ -2,6 +2,4 @@ echo "burndown test-resources:" -export UID_GID="$(id -u):$(id -g)" - docker compose down diff --git a/playbooks/roles/test-resources/templates/docker/burnup b/playbooks/roles/test-resources/templates/docker/burnup index 1c1a6d3d..d3628c03 100755 --- a/playbooks/roles/test-resources/templates/docker/burnup +++ b/playbooks/roles/test-resources/templates/docker/burnup @@ -4,8 +4,6 @@ echo "burnup test-resources:" mkdir -p {{ tapisdatadir }}/test-resources -export UID_GID="$(id -u):$(id -g)" - #docker compose up -d SCRIPT_DIR=$(dirname $0) diff --git a/playbooks/roles/test-resources/templates/docker/docker-compose.yml b/playbooks/roles/test-resources/templates/docker/docker-compose.yml index 81d7b0d4..35564b09 100644 --- a/playbooks/roles/test-resources/templates/docker/docker-compose.yml +++ b/playbooks/roles/test-resources/templates/docker/docker-compose.yml @@ -17,8 +17,8 @@ services: - MINIO_ACCESS_KEY={{ test_resources_minio_1_user }} - MINIO_SECRET_KEY={{ test_resources_minio_1_password }} ports: - - "{{ test_resources_minio_1_server_port }}:9000" - - "{{ test_resources_minio_1_console_port }}:9001" + - {{ test_resources_minio_1_server_port }}:9000 + - {{ test_resources_minio_1_console_port }}:9001 networks: - tapis volumes: @@ -29,7 +29,7 @@ services: container_name: irods-1 image: mjstealey/irods-provider-postgres:4.2.4 ports: - - "{{ test_resources_irods_1_port }}:22" + - {{ test_resources_irods_1_port }}:22 networks: - tapis @@ -39,7 +39,7 @@ services: context: . dockerfile: ssh/Dockerfile.ssh ports: - - "{{ test_resources_ssh_1_port }}:22" + - {{ test_resources_ssh_1_port }}:22 networks: - tapis @@ -49,7 +49,7 @@ services: context: . dockerfile: ssh/Dockerfile.ssh ports: - - "{{ test_resources_ssh_2_port }}:22" + - {{ test_resources_ssh_2_port }}:22 networks: - tapis @@ -59,7 +59,7 @@ services: context: . dockerfile: slurm/Dockerfile.ssh ports: - - "{{ test_resources_slurm_1_port }}:22" + - {{ test_resources_slurm_1_port }}:22 networks: - tapis privileged: true diff --git a/playbooks/roles/vault/templates/docker/burnup b/playbooks/roles/vault/templates/docker/burnup index 7e1df5b6..5b71f2c2 100755 --- a/playbooks/roles/vault/templates/docker/burnup +++ b/playbooks/roles/vault/templates/docker/burnup @@ -7,7 +7,6 @@ echo "burnup vault:" mkdir -p {{ tapisdatadir }}/vault/data MYUID=`id -u` - docker run -it --rm -v {{ tapisdatadir }}/vault:/vault {{ vault_util_image }} chown $MYUID /vault docker run -it --rm -v {{ tapisdatadir }}/vault:/vault {{ vault_image }} chown -R 100:1000 /vault/data @@ -25,6 +24,14 @@ then exit 1 fi +# wait until vault is healthy +until [ "`docker inspect -f {% raw %}{{.State.Health.Status}}{% endraw %} vault`" == "healthy" ] +do + echo -n "Waiting for Vault container to become healthy. Status: " + docker inspect -f {% raw %}{{.State.Health.Status}}{% endraw %} vault + sleep 1 +done + # check if vault is unsealed already #sleep 5 if VAULTSTAT=`docker exec -it vault vault status -format=json` @@ -101,7 +108,7 @@ then fi # give vault some time to get fully booted up before the following services try to use it -#sleep 30 +sleep 10 exit 0 diff --git a/playbooks/roles/vault/templates/docker/docker-compose.yml b/playbooks/roles/vault/templates/docker/docker-compose.yml index d0a864f6..1889afa2 100644 --- a/playbooks/roles/vault/templates/docker/docker-compose.yml +++ b/playbooks/roles/vault/templates/docker/docker-compose.yml @@ -21,9 +21,6 @@ services: networks: - tapis healthcheck: - test: [ "CMD", "wget", "--spider", "--proxy", "off", "http://127.0.0.1:8200/v1/sys/health?standbyok=true" ] - interval: 10s - timeout: 3s - retries: 10 - start_period: 5s + # Just waiting for status to actually give output + test: vault status | grep Value