Diederik has submitted this change and it was merged.

Change subject: Minor tweaks.
......................................................................


Minor tweaks.

Change-Id: I89d8a548d91e960d521a5a09a70dd329efaf484e
---
M labs-migration-assistant/fabfile.py
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Diederik: Verified; Looks good to me, approved



diff --git a/labs-migration-assistant/fabfile.py 
b/labs-migration-assistant/fabfile.py
index 011022d..a3b56c0 100644
--- a/labs-migration-assistant/fabfile.py
+++ b/labs-migration-assistant/fabfile.py
@@ -162,10 +162,11 @@
                else:
                        logging.error('You are running your own self-hosted 
puppet master. [FAIL]')
                        labinstances[env.host_string].detect_self_puppetmaster 
= False
+                       labinstances[env.host_string].connect = True
        except SystemExit:
                logging.error('Could not connect to %s.' % env.host_string)
                labinstances[env.host_string].connect = False # we only to set 
this once if we cannot connect to the instance.
-       labinstances[env.host_string].connect = True
+       
 
 @task
 def detect_last_puppet_run(labinstances):
@@ -258,7 +259,7 @@
        
        for labsinstance in labinstances.values():
                        if not labsinstance.connect:
-                               logging.error('There were problems connecting 
to instance %s, fix those problems first and then rerun this script.' % 
labsinstance)
+                               logging.error('There were problems connecting 
to instance %s, please fix those problems first and then rerun this script.' % 
labsinstance)
                        else:
                                logging.error('%s does not yet seem to be ready 
for migration to eqiad. Please fix the %d identified problems.' % 
(labsinstance, labsinstance.count_errors()))
                                logging.info('Summary of failed tasks:')
@@ -268,6 +269,9 @@
                                        if not result:
                                                logging.info('Problem %d: task 
%s [FAIL]' % (problems, task))
                                                problems +=1
+                               if problems == 1:
+                                       logging.info('Congratulations! %s seems 
ready for migration!' % labinstance)
+
 
 run = logged(run)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/107909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I89d8a548d91e960d521a5a09a70dd329efaf484e
Gerrit-PatchSet: 1
Gerrit-Project: labs/migration-assistant
Gerrit-Branch: master
Gerrit-Owner: Diederik <[email protected]>
Gerrit-Reviewer: Diederik <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to