launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/lp-signing:charm-fix-db-name into lp-signing:master.

Commit message:
Fix DB name and roles in charm

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/lp-signing/+git/lp-signing/+merge/381656

The PostgreSQL charm infrastructure defaults to "lp-signing", and setting the database name to "lp_signing" here causes it to create both lp-signing and lp_signing databases and then fail to provide the expected information to the pgsql interface.  Just go with the flow and use "lp-signing", since that's neater anyway.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/lp-signing:charm-fix-db-name into lp-signing:master.

diff --git a/charm/lp-signing/layer.yaml b/charm/lp-signing/layer.yaml
index 66de87c..c42c61c 100644
--- a/charm/lp-signing/layer.yaml
+++ b/charm/lp-signing/layer.yaml
@@ -15,7 +15,7 @@ options:
     ols-pg:
         databases:
             db:
-                name: lp_signing
-                roles: lp_signing
+                name: lp-signing
+                roles: lp-signing
                 migrations: migrations
 repo: https://git.launchpad.net/lp-signing