x/packstack
Code Issues Proposed changes

Fixed old name and added accidentaly deleted function

Browse Source 
Change-Id: I7f78f12f0163173cd52ece7985006db61fdc56c3
This commit is contained in:
Martin Magr
2013-04-29 13:36:13 +02:00
parent 3d495d4415
commit f0ee3f33d9
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/installer/run_setup.py
View File

@@ -640,7 +640,7 @@ def generateAnswerFile(outputFile, overrides={}):
def single_step_aio_install(options): def single_step_aio_install(options):
""" Installs an All in One host on this host""" """ Installs an All in One host on this host"""
options.install_hosts = utils.getLocalhostIP() options.install_hosts = utils.get_localhost_ip()
# Also allow the command line to set values for any of these options # Also allow the command line to set values for any of these options
# by testing if they have been set before we set them here # by testing if they have been set before we set them here

4
packstack/installer/utils/__init__.py
View File

@@ -2,7 +2,7 @@
from .datastructures import SortedDict from .datastructures import SortedDict
from .decorators import retry from .decorators import retry
from .network import get_localhost_ip, host2ip, force_ip from .network import get_localhost_ip, host2ip, force_ip, device_from_ip
from .shell import ScriptRunner, execute from .shell import ScriptRunner, execute
from .strings import color_text, mask_string from .strings import color_text, mask_string
@@ -10,5 +10,5 @@ from .strings import color_text, mask_string
__all__ = ('SortedDict', __all__ = ('SortedDict',
'retry', 'retry',
'ScriptRunner', 'execute', 'ScriptRunner', 'execute',
'get_localhost_ip', 'host2ip', 'force_ip', 'get_localhost_ip', 'host2ip', 'force_ip', 'device_from_ip',
'color_text', 'mask_string') 'color_text', 'mask_string')

13
packstack/installer/utils/network.py
View File

@@ -3,7 +3,7 @@
import re import re
import socket import socket
from .shell import execute from .shell import execute, ScriptRunner
def get_localhost_ip(): def get_localhost_ip():
@@ -72,3 +72,14 @@ def force_ip(host, allow_localhost=False):
if not ipv4_regex.match(host) or not ipv6_regex.match(host): if not ipv4_regex.match(host) or not ipv6_regex.match(host):
host = host2ip(host, allow_localhost=allow_localhost) host = host2ip(host, allow_localhost=allow_localhost)
return host return host
def device_from_ip(ip):
server = ScriptRunner()
server.append("DEVICE=$(ip address show to %s | head -n 1 |"
" sed -e 's/.*: \(.*\):.*/\\1/g')" % ip)
# Test device, raises an exception if it doesn't exist
server.append("ip link show \"$DEVICE\" > /dev/null")
server.append("echo $DEVICE")
rv, stdout = server.execute()
return stdout.strip()