From fc878f5b63c74e9213c41092ad4985c4140f9f3c Mon Sep 17 00:00:00 2001 From: kevinpricethesecond Date: Mon, 24 Jun 2024 14:07:38 -0500 Subject: [PATCH 1/3] update parse_skexport mapping & remove bad db declaration --- playbooks/roles/admin/templates/docker/util/parse_skexport | 6 +++--- playbooks/roles/streams/templates/docker/docker-compose.yml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/playbooks/roles/admin/templates/docker/util/parse_skexport b/playbooks/roles/admin/templates/docker/util/parse_skexport index 4139a5e8..1b5e226f 100644 --- a/playbooks/roles/admin/templates/docker/util/parse_skexport +++ b/playbooks/roles/admin/templates/docker/util/parse_skexport @@ -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/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: From a4bbcab5ddf6ae71a54b1125de646960e8270608 Mon Sep 17 00:00:00 2001 From: mpackard Date: Mon, 24 Jun 2024 15:29:15 -0500 Subject: [PATCH 2/3] changelog fix --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c757fdc5..799545c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ ### 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)](Systems changes: 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)](Files changes: https://github.com/tapis-project/tapis-files/blob/dev/CHANGELOG.md) -- [Jobs: 1.6.2 to 1.6.3 (tapis/jobsworker, jobsmigrate, jobsapi)](Jobs changes: https://github.com/tapis-project/tapis-jobs/blob/dev/tapis-jobsapi/CHANGELOG.md) -- [Globus-Proxy: 1.6.1 to 1.6.1 (tapis/globus-proxy)](Globus Proxy changes: https://github.com/tapis-project/globus-proxy/blob/dev/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.1 to 1.6.1 (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 From 41037d03c0e703ebd3ab05bcd86153b775e64047 Mon Sep 17 00:00:00 2001 From: mpackard Date: Tue, 25 Jun 2024 15:38:23 -0500 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 799545c8..36249633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - [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.1 to 1.6.1 (tapis/globus-proxy)](https://github.com/tapis-project/globus-proxy/blob/dev/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