Merge ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:config-in-database into charm-k8s-mattermost:master

Proposed by Paul Collins
Status: Merged
Approved by: Paul Collins
Approved revision: 9dd54d2f7d160be93665707390eddee1681b584a
Merged at revision: c1ce3175802e4b5df9a31cede1848db97f819b2e
Proposed branch: ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:config-in-database
Merge into: charm-k8s-mattermost:master
Diff against target: 17 lines (+4/-1)
1 file modified
src/charm.py (+4/-1)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Canonical IS Reviewers Pending
Review via email: mp+384595@code.launchpad.net

Commit message

store config in database

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Stuart Bishop (stub) wrote :

Yup, a work around is best and thanks for filing the upstream MP.

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision c1ce3175802e4b5df9a31cede1848db97f819b2e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/charm.py b/src/charm.py
index 5aae587..84e2c54 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -119,9 +119,12 @@ class MattermostK8sCharm(CharmBase):
119119
120 def _make_pod_config(self):120 def _make_pod_config(self):
121 config = self.model.config121 config = self.model.config
122 # https://github.com/mattermost/mattermost-server/pull/14666
123 db_uri = self.state.db_uri.replace('postgresql://', 'postgres://')
122 pod_config = {124 pod_config = {
123 'MATTERMOST_HTTPD_LISTEN_PORT': CONTAINER_PORT,125 'MATTERMOST_HTTPD_LISTEN_PORT': CONTAINER_PORT,
124 'MM_SQLSETTINGS_DATASOURCE': self.state.db_uri,126 'MM_CONFIG': db_uri,
127 'MM_SQLSETTINGS_DATASOURCE': db_uri,
125 'MM_ENABLEOPENSERVER': config['open_server'],128 'MM_ENABLEOPENSERVER': config['open_server'],
126 }129 }
127130

Subscribers

People subscribed via source and target branches