Merge pull request #376 from tapis-project/dev

Dev

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.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

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"
 }

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: