x/packstack
Code Issues Proposed changes

Don't throw false message in case root home dir was changed.

Browse Source 
Change-Id: I4ccaa071199235dd07577d17f5869f99422d2b7c
This commit is contained in:
Martin Magr
2013-02-20 12:37:47 +01:00
parent c4cbf18645
commit cd749ae656
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/installer/common_utils.py
View File

@@ -406,7 +406,7 @@ class ScriptRunner(object):
else: else:
raise ScriptRuntimeError('Error running remote script: ' raise ScriptRuntimeError('Error running remote script: '
'%s' % stdoutdata) '%s' % stdoutdata)
return returncode, stdoutdata, stderrdata return returncode, stdoutdata
def template(self, src, dst, varsdict): def template(self, src, dst, varsdict):
with open(src) as fp: with open(src) as fp:

1
packstack/installer/output_messages.py
View File

@@ -84,5 +84,4 @@ ERR_ONLY_1_FLAG="Error: The %s flag is mutually exclusive to all other command l
ERR_REMOVE_REMOTE_VAR="Error: Failed to remove directory %s on %s, it contains sensitive data and should be removed" ERR_REMOVE_REMOTE_VAR="Error: Failed to remove directory %s on %s, it contains sensitive data and should be removed"
# #
INFO_KEYSTONERC="To use the command line tools source the file /root/keystonerc_admin created on %s"
INFO_DASHBOARD="To use the console, browse to http://%s/dashboard" INFO_DASHBOARD="To use the console, browse to http://%s/dashboard"

12
packstack/plugins/openstack_client_400.py
View File

@@ -59,7 +59,15 @@ def initSequences(controller):
controller.addSequence("Installing OpenStack Client", [], [], osclientsteps) controller.addSequence("Installing OpenStack Client", [], [], osclientsteps)
def createmanifest(): def createmanifest():
manifestfile = "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST'] client_host = controller.CONF['CONFIG_OSCLIENT_HOST'].strip()
manifestfile = "%s_osclient.pp" % client_host
manifestdata = getManifestTemplate("openstack_client.pp") manifestdata = getManifestTemplate("openstack_client.pp")
appendManifestFile(manifestfile, manifestdata) appendManifestFile(manifestfile, manifestdata)
controller.MESSAGES.append(output_messages.INFO_KEYSTONERC%controller.CONF['CONFIG_OSCLIENT_HOST'])
server = utils.ScriptRunner(client_host)
server.append('echo $HOME')
rc, root_home = server.execute()
msg = ("To use the command line tools you need to source the file "
"%s/keystonerc_admin created on %s")
controller.MESSAGES.append(msg % (root_home.strip(), client_host))