launchpad-reviewers team mailing list archive

[Colin Watson <mp+441582@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-mail-configure into launchpad:master.

Commit message:
charm: Configure outbound email if send_email is true

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #2017136 in launchpad-layers: "No email received after changing the OpenPGP key"
  https://bugs.launchpad.net/launchpad-layers/+bug/2017136

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/441582

This pulls in and uses https://code.launchpad.net/~cjwatson/launchpad-layers/+git/launchpad-layers/+merge/441577.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-mail-configure into launchpad:master.

diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
index 1fbca20..e640df9 100644
--- a/charm/launchpad-admin/charmcraft.yaml
+++ b/charm/launchpad-admin/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
     after:
       - ols-layers
     source: https://git.launchpad.net/launchpad-layers
-    source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
+    source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-admin/reactive/launchpad-admin.py b/charm/launchpad-admin/reactive/launchpad-admin.py
index d00383a..3d44168 100644
--- a/charm/launchpad-admin/reactive/launchpad-admin.py
+++ b/charm/launchpad-admin/reactive/launchpad-admin.py
@@ -6,6 +6,7 @@ import subprocess
 
 from charmhelpers.core import hookenv, host, templating
 from charms.launchpad.base import (
+    configure_email,
     configure_lazr,
     get_service_config,
     home_dir,
@@ -111,6 +112,7 @@ def configure():
         "launchpad-admin-lazr.conf",
         "launchpad-admin/launchpad-lazr.conf",
     )
+    configure_email(config, "launchpad-admin")
     templating.render(
         "bash_aliases.j2",
         os.path.join(home_dir(), ".bash_aliases"),
diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index deb7add..14708d5 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
     after:
       - ols-layers
     source: https://git.launchpad.net/launchpad-layers
-    source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
+    source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-appserver/reactive/launchpad-appserver.py b/charm/launchpad-appserver/reactive/launchpad-appserver.py
index 1edc216..61cd796 100644
--- a/charm/launchpad-appserver/reactive/launchpad-appserver.py
+++ b/charm/launchpad-appserver/reactive/launchpad-appserver.py
@@ -10,6 +10,7 @@ from charms.coordinator import acquire
 from charms.launchpad.base import (
     config_file_path,
     configure_cron,
+    configure_email,
     configure_lazr,
     get_service_config,
     lazr_config_files,
@@ -125,6 +126,7 @@ def configure():
         "launchpad-appserver-secrets-lazr.conf",
         secret=True,
     )
+    configure_email(config, "launchpad-appserver")
     configure_gunicorn(config)
     configure_logrotate(config)
     configure_cron(config, "crontab.j2")
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index 56666d4..b3205bf 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -35,7 +35,7 @@ parts:
     after:
       - ols-layers
     source: https://git.launchpad.net/launchpad-layers
-    source-commit: "81c2d5b77d3c2cb4fce42c15ae2a7381ebab7f8f"
+    source-commit: "6a50917f5f6163069ae1661e3320abb5b48173a3"
     source-submodules: []
     source-type: git
     plugin: dump