openstack
/
python-tripleoclient
Code Issues Proposed changes

Ensure the undercloud output dir constant is consistent 

By default the output directory is the executing users home folder,
however, because this is meant to be user configurable, we need
to modify our constants to respect the users configured information.

This change ensures that the constant UNDERCLOUD_OUTPUT_DIR is consistently
by pre-loading the undercloud configration file when present and pulling
out the `output_dir` option. When this file is not present or the option
is undefined, the constant will use the executing users home folder; the
execting users home folder is the original default.

Related-Bug: #1868619

Change-Id: I94257d1d5ceb2795f5d9596a6a1d5066d881c3b7
Signed-off-by: Kevin Carter <kecarter@redhat.com>
This commit is contained in:
Kevin Carter 2020-03-23 16:06:38 -05:00
parent 8dc3273495
commit d38c7c329f
No known key found for this signature in database
GPG Key ID: CE94BD890A47B20A
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tripleoclient/constants.py
View File

@ -15,6 +15,18 @@
import os
# NOTE(cloudnull): Condition imports and exceptions to support PY2, When we
# drop py2 this should be simplified.
try:
import configparser as cfgp
except ImportError:
import ConfigParser as cfgp
try:
FileNotFoundError = FileNotFoundError
except NameError:
FileNotFoundError = IOError
TRIPLEO_HEAT_TEMPLATES = "/usr/share/openstack-tripleo-heat-templates/"
OVERCLOUD_YAML_NAME = "overcloud.yaml"
OVERCLOUD_ROLES_FILE = "roles_data.yaml"
@ -23,10 +35,8 @@ MINION_OUTPUT_DIR = os.path.join(os.environ.get('HOME', '~/'))
MINION_CONF_PATH = os.path.join(MINION_OUTPUT_DIR, "minion.conf")
MINION_LOG_FILE = "install-minion.log"
UNDERCLOUD_ROLES_FILE = "roles_data_undercloud.yaml"
UNDERCLOUD_OUTPUT_DIR = os.path.join(os.environ.get('HOME', '~/'))
STANDALONE_EPHEMERAL_STACK_VSTATE = '/var/lib/tripleo-heat-installer'
UNDERCLOUD_LOG_FILE = "install-undercloud.log"
UNDERCLOUD_CONF_PATH = os.path.join(UNDERCLOUD_OUTPUT_DIR, "undercloud.conf")
OVERCLOUD_NETWORKS_FILE = "network_data.yaml"
STANDALONE_NETWORKS_FILE = "/dev/null"
UNDERCLOUD_NETWORKS_FILE = "network_data_undercloud.yaml"
@ -145,6 +155,18 @@ DEPRECATED_SERVICES = {"OS::TripleO::Services::OpenDaylightApi":
CLOUD_HOME_DIR = os.path.expanduser("~")
CLOUDS_YAML_DIR = os.path.join('.config', 'openstack')
# Undercloud config and output
UNDERCLOUD_CONF_PATH = os.path.join(CLOUD_HOME_DIR, "undercloud.conf")
try:
if os.path.exists(UNDERCLOUD_CONF_PATH):
config = cfgp.ConfigParser()
config.read(UNDERCLOUD_CONF_PATH)
UNDERCLOUD_OUTPUT_DIR = config.get('DEFAULT', 'output_dir')
else:
raise FileNotFoundError
except (cfgp.NoOptionError, FileNotFoundError):
UNDERCLOUD_OUTPUT_DIR = CLOUD_HOME_DIR
# regex patterns to exclude when looking for unused params
# - exclude *Image params as they may be unused because the service is not
# enabled