Merge "Don't report 'exiting' when mapping cells"

Author: Zuul

nova/cmd/manage.py

@@ -1329,7 +1329,7 @@ def _map_cell_and_hosts(self, transport_url, name=None, verbose=False):
                 # we should support.
                 cell_mapping_uuid = host_mapping.cell_mapping.uuid
         if not missing_nodes:
-            print(_('All hosts are already mapped to cell(s), exiting.'))
+            print(_('All hosts are already mapped to cell(s).'))
             return cell_mapping_uuid
         # Create the cell mapping in the API database
         if cell_mapping_uuid is not None:

nova/tests/unit/test_nova_manage.py

@@ -1103,7 +1103,7 @@ def test_map_cell_and_hosts_duplicate(self):
         for i in range(3):
             expected += ('Host host%s is already mapped to cell %s\n' %
                          (i, cell_mapping_uuid))
-        expected += 'All hosts are already mapped to cell(s), exiting.'
+        expected += 'All hosts are already mapped to cell(s).'
         self.assertEqual(expected, output)
 
     def test_map_cell_and_hosts_partial_update(self):