Browse Source

Merge "Normalize the 'undercloud-passwords.conf' return data"

tags/13.2.0
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
6f330e623e
2 changed files with 13 additions and 4 deletions
  1. +9
    -2
      tripleoclient/v1/undercloud.py
  2. +4
    -2
      tripleoclient/v1/undercloud_preflight.py

+ 9
- 2
tripleoclient/v1/undercloud.py View File

@@ -17,6 +17,7 @@

import argparse
import logging
import os
import subprocess

from openstackclient.i18n import _
@@ -145,7 +146,10 @@ class InstallUndercloud(command.Command):
try:
subprocess.check_call(cmd)
self.log.warning(UNDERCLOUD_COMPLETION_MESSAGE.format(
'~/undercloud-passwords.conf',
os.path.join(
constants.UNDERCLOUD_OUTPUT_DIR,
'undercloud-passwords.conf'
),
'~/stackrc'
))
except Exception as e:
@@ -183,7 +187,10 @@ class UpgradeUndercloud(InstallUndercloud):
subprocess.check_call(cmd)
self.log.warning(
UNDERCLOUD_UPGRADE_COMPLETION_MESSAGE.format(
'~/undercloud-passwords.conf',
os.path.join(
constants.UNDERCLOUD_OUTPUT_DIR,
'undercloud-passwords.conf'
),
'~/stackrc'))
except Exception as e:
self.log.error(UNDERCLOUD_FAILURE_MESSAGE)


+ 4
- 2
tripleoclient/v1/undercloud_preflight.py View File

@@ -39,8 +39,10 @@ CONF = cfg.CONF
# We need 8 GB, leave a little room for variation in what 8 GB means on
# different platforms.
REQUIRED_MB = 7680
PASSWORD_PATH = '%s/%s' % (constants.UNDERCLOUD_OUTPUT_DIR,
'undercloud-passwords.conf')
PASSWORD_PATH = os.path.join(
constants.UNDERCLOUD_OUTPUT_DIR,
'undercloud-passwords.conf'
)

LOG = logging.getLogger(__name__ + ".UndercloudSetup")



Loading…
Cancel
Save