Merge "Normalize the 'undercloud-passwords.conf' return data"
This commit is contained in:
commit
6f330e623e
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
from openstackclient.i18n import _
|
from openstackclient.i18n import _
|
||||||
|
@ -145,7 +146,10 @@ class InstallUndercloud(command.Command):
|
||||||
try:
|
try:
|
||||||
subprocess.check_call(cmd)
|
subprocess.check_call(cmd)
|
||||||
self.log.warning(UNDERCLOUD_COMPLETION_MESSAGE.format(
|
self.log.warning(UNDERCLOUD_COMPLETION_MESSAGE.format(
|
||||||
'~/undercloud-passwords.conf',
|
os.path.join(
|
||||||
|
constants.UNDERCLOUD_OUTPUT_DIR,
|
||||||
|
'undercloud-passwords.conf'
|
||||||
|
),
|
||||||
'~/stackrc'
|
'~/stackrc'
|
||||||
))
|
))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
@ -183,7 +187,10 @@ class UpgradeUndercloud(InstallUndercloud):
|
||||||
subprocess.check_call(cmd)
|
subprocess.check_call(cmd)
|
||||||
self.log.warning(
|
self.log.warning(
|
||||||
UNDERCLOUD_UPGRADE_COMPLETION_MESSAGE.format(
|
UNDERCLOUD_UPGRADE_COMPLETION_MESSAGE.format(
|
||||||
'~/undercloud-passwords.conf',
|
os.path.join(
|
||||||
|
constants.UNDERCLOUD_OUTPUT_DIR,
|
||||||
|
'undercloud-passwords.conf'
|
||||||
|
),
|
||||||
'~/stackrc'))
|
'~/stackrc'))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log.error(UNDERCLOUD_FAILURE_MESSAGE)
|
self.log.error(UNDERCLOUD_FAILURE_MESSAGE)
|
||||||
|
|
|
@ -39,8 +39,10 @@ CONF = cfg.CONF
|
||||||
# We need 8 GB, leave a little room for variation in what 8 GB means on
|
# We need 8 GB, leave a little room for variation in what 8 GB means on
|
||||||
# different platforms.
|
# different platforms.
|
||||||
REQUIRED_MB = 7680
|
REQUIRED_MB = 7680
|
||||||
PASSWORD_PATH = '%s/%s' % (constants.UNDERCLOUD_OUTPUT_DIR,
|
PASSWORD_PATH = os.path.join(
|
||||||
'undercloud-passwords.conf')
|
constants.UNDERCLOUD_OUTPUT_DIR,
|
||||||
|
'undercloud-passwords.conf'
|
||||||
|
)
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__ + ".UndercloudSetup")
|
LOG = logging.getLogger(__name__ + ".UndercloudSetup")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue