From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Mon, 23 Sep 2013 15:37:41 +0000 (-0400)
Subject: fix hostname resolution in mon destroy calls
X-Git-Tag: v1.2.7~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F88%2Fhead;p=ceph-deploy.git

fix hostname resolution in mon destroy calls

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/mon.py b/ceph_deploy/mon.py
index 852a2e7..63cfc49 100644
--- a/ceph_deploy/mon.py
+++ b/ceph_deploy/mon.py
@@ -4,6 +4,7 @@ import json
 import logging
 import re
 import subprocess
+import socket
 from textwrap import dedent
 import time
 
@@ -152,16 +153,14 @@ def hostname_is_compatible(conn, logger, provided_hostname):
     logger.warning('*'*80)
 
 
-def destroy_mon(cluster, paths, is_running):
+def destroy_mon(cluster, paths, is_running, hostname):
     import datetime
     import errno
     import os
     import subprocess  # noqa
-    import socket
     import time
     retries = 5
 
-    hostname = remote_shortname(socket)
     path = paths.mon.path(cluster, hostname)
 
     if os.path.exists(path):
@@ -232,6 +231,7 @@ def destroy_mon(cluster, paths, is_running):
                 raise
         os.rename(path, os.path.join('/var/lib/ceph/mon-removed/', fn))
 
+
 def mon_destroy(args):
     errors = 0
     for (name, host) in mon_hosts(args.mon):
@@ -240,12 +240,14 @@ def mon_destroy(args):
 
             # TODO username
             sudo = args.pushy(get_transport(host))
+            hostname = remote_shortname(socket)
 
             destroy_mon_r = sudo.compile(destroy_mon)
             destroy_mon_r(
                 cluster=args.cluster,
                 paths=paths,
                 is_running=is_running,
+                hostname=hostname,
                 )
             sudo.close()