Merge ~pjdc/discourse-charm/+git/discourse-charm:bundle-is-not-asynchronous into discourse-charm:master

[Paul Collins]

prepare_codebase: bundle() is not asynchronous, so there's no rake to wait for

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

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

[Barry Price (barryprice)]

+1

review: Approve

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

Change successfully merged at revision 4a801232e772ddb7973cee5c5f1bfac73e9eac57

diff --git a/reactive/discourse.py b/reactive/discourse.py
index 3e27cda..8fbd9c7 100644
--- a/reactive/discourse.py
+++ b/reactive/discourse.py
@@ -141,19 +141,6 @@ def prepare_codebase(pgsql):
     bundle('exec rake db:migrate RAILS_ENV=production')
     # Compile CSS/JS?  I'm not sure what this does but it's necessary.
     bundle('exec rake assets:precompile RAILS_ENV=production')
-    # The asset compilation takes a while and we need to do some things once
-    # it finishes, so sit and spin while it runs.
-    timeout = time.time() + 60 * 5
-    rake_done = False
-    while time.time() < timeout and rake_done is False:
-        # This seems weird but we want to assume the rake is done, then if we
-        # find it in the process list, set rake_done back to False, I can't
-        # think of a good way to check this otherwise.
-        rake_done = True
-        for p in psutil.process_iter():
-            if 'rake' in p.name() or 'rake' in ' '.join(p.cmdline()):
-                rake_done = False
-        time.sleep(5)
     if hookenv.config('plugins'):
         fetch_plugins()
     # The ruby layer doesn't have a concept of ownership, so after the rakes