Merge pull request #187 from CuBoulder/hotfix/186

Run registry rebuild separately to make sure all hosts have the new c…

fabfile/__init__.py

@@ -214,9 +214,6 @@ def site_package_update(site):
         run("rm -rf modules/custom modules/contrib")
         run("drush dslm-remove-all-packages")
         run("drush dslm-add-package {0}".format(package_name_string))
-        if len(package_name_string) > 0:
-            print('Rebuild registry.')
-            run("drush rr")
 
 
 @roles('webservers')
@@ -243,8 +240,6 @@ def site_profile_update(site, original, updates):
             code_root,
             new_profile['meta']['name'],
             new_profile_full_string))
-        print('Rebuild registry.')
-        run("drush rr")
 
 
 @roles('webservers')
@@ -453,6 +448,20 @@ def update_database(site):
         run("drush updb -y")
 
 
+@roles('webserver_single')
+def registry_rebuild(site):
+    """
+    Run a drush rr
+
+    :param site: Site to run command on
+    :return:
+    """
+    print('Drush registry rebuild\n{0}'.format(site))
+    code_directory_sid = '{0}/{1}/{1}'.format(sites_code_root, site['sid'])
+    with cd(code_directory_sid):
+        run("drush rr")
+
+
 @roles('webservers')
 def clear_apc():
     run("wget -q -O - http://localhost/sysadmintools/apc/clearapc.php")
@@ -485,8 +494,6 @@ def rewrite_symlinks(site):
     if site['status'] == 'launched' and site['pool'] == 'poolb-homepage':
         web_directory = '{0}/{1}'.format(sites_web_root, 'homepage')
         _update_symlink(code_directory_current, web_directory)
-    with cd(web_directory):
-        run("drush rr")
 
 
 @roles('webservers')

tasks.py

@@ -175,6 +175,10 @@ def site_import_from_inventory(site):
     logger.debug(rewrite_symlinks_task)
     logger.debug(rewrite_symlinks_task.values)
 
+    rewrite_symlinks_task = execute(fabfile.registry_rebuild, site=site)
+    logger.debug(rewrite_symlinks_task)
+    logger.debug(rewrite_symlinks_task.values)
+
     database_update_task = execute(fabfile.update_database, site=site)
     logger.debug(database_update_task)
     logger.debug(database_update_task.values)
@@ -239,6 +243,7 @@ def site_update(site, updates, original):
             package_change = True
             execute(fabfile.site_package_update, site=site)
         if core_change or profile_change or package_change:
+            execute(fabfile.registry_rebuild, site=site)
             execute(fabfile.update_database, site=site)
 
     if updates.get('status'):