Merge ~ballot/apache2-charm:lp1863860 into apache2-charm:master

[Benjamin Allot]

Fix extra_packages config when used with several packages

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Tom Haddon (mthaddon)]

One small change, otherwise looks good.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Merge proposal is approved, but source revision has changed, setting status to needs review.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision e4a6d41f626a45e77bfdd8934e7de2618a802bfa

diff --git a/config.yaml b/config.yaml
index 5147352..23c4d65 100644
--- a/config.yaml
+++ b/config.yaml
@@ -195,7 +195,10 @@ options:
     default: "On"
   extra_packages:
     type: string
-    description: List of extra packages to be installed (e.g. commercial GeoIP package)
+    description: |
+        List of extra packages to be installed (e.g. commercial GeoIP package).
+        This can be a string of packages space or comma separated.
+        i.e "screen cowsay" or "screen,cowsay".
     default: ""
   openid_provider:
     type: string
diff --git a/hooks/hooks.py b/hooks/hooks.py
index b2647f7..0c652f7 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -57,7 +57,8 @@ def apt_get_install(package=None):
     if package is None:
         return False
     cmd_line = ['apt-get', '-y', 'install', '-qq']
-    cmd_line.append(package)
+    for pkg in re.split(' |,'):
+        cmd_line.append(pkg)
     return subprocess.call(cmd_line)