Fix default hostname generator so that it won't use underscores, and use minus signs instead.

1 files changed, 3 insertions, 3 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 06f09f9a6..60a13631a 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -55,15 +55,15 @@ def generate_default_hostname(instance):
     """Default function to generate a hostname given an instance reference."""
     display_name = instance['display_name']
     if display_name is None:
-        return 'server_%d' % (instance['id'],)
+        return 'server-%d' % (instance['id'],)
     table = ''
     deletions = ''
     for i in xrange(256):
         c = chr(i)
         if ('a' <= c <= 'z') or ('0' <= c <= '9') or (c == '-'):
             table += c
-        elif c == ' ':
-            table += '_'
+        elif c in " _":
+            table += '-'
         elif ('A' <= c <= 'Z'):
             table += c.lower()
         else: