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
1diff --git a/src/charm.py b/src/charm.py
2index 5aae587..84e2c54 100755
3--- a/src/charm.py
4+++ b/src/charm.py
5@@ -119,9 +119,12 @@ class MattermostK8sCharm(CharmBase):
6
7 def _make_pod_config(self):
8 config = self.model.config
9+ # https://github.com/mattermost/mattermost-server/pull/14666
10+ db_uri = self.state.db_uri.replace('postgresql://', 'postgres://')
11 pod_config = {
12 'MATTERMOST_HTTPD_LISTEN_PORT': CONTAINER_PORT,
13- 'MM_SQLSETTINGS_DATASOURCE': self.state.db_uri,
14+ 'MM_CONFIG': db_uri,
15+ 'MM_SQLSETTINGS_DATASOURCE': db_uri,
16 'MM_ENABLEOPENSERVER': config['open_server'],
17 }
18

Subscribers

People subscribed via source and target branches