openstack
/
ironic-python-agent-builder
Code Issues Proposed changes

Merge "Fix ELEMENTS_PATH environment variable being overwritten."

This commit is contained in:
Zuul 2021-01-04 15:54:08 +00:00 committed by Gerrit Code Review
parent 8afcde90ce b072c155f5
commit 6cb1dbcad0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ironic_python_agent_builder/__init__.py
View File

@ -50,21 +50,29 @@ def main():
help="Additional DIB element to use") help="Additional DIB element to use")
parser.add_argument("-b", "--branch", parser.add_argument("-b", "--branch",
help="If set, override the branch that is used for " help="If set, override the branch that is used for "
"ironic-python-agent and requirements") "ironic-python-agent and requirements")
parser.add_argument("-v", "--verbose", action='store_true', parser.add_argument("-v", "--verbose", action='store_true',
help="Enable verbose logging in diskimage-builder") help="Enable verbose logging in diskimage-builder")
parser.add_argument("--lzma", action='store_true', parser.add_argument("--lzma", action='store_true',
help="Use lzma compression for smaller images") help="Use lzma compression for smaller images")
parser.add_argument("--extra-args", parser.add_argument("--extra-args",
help="Extra arguments to pass to diskimage-builder") help="Extra arguments to pass to diskimage-builder")
parser.add_argument("--elements-path",
help="Path(s) to custom DIB elements separated by "
"a colon")
# TODO(dtantsur): handle distribution == tinyipa # TODO(dtantsur): handle distribution == tinyipa
os.environ['ELEMENTS_PATH'] = find_elements_path() args = parser.parse_args()
if args.elements_path:
os.environ['ELEMENTS_PATH'] = args.elements_path
if 'ELEMENTS_PATH' in os.environ:
os.environ['ELEMENTS_PATH'] += ":" + find_elements_path()
else:
os.environ['ELEMENTS_PATH'] = find_elements_path()
if not os.environ.get('DIB_INSTALLTYPE_pip_and_virtualenv'): if not os.environ.get('DIB_INSTALLTYPE_pip_and_virtualenv'):
# DIB updates these to latest versions from source. However, we do the # DIB updates these to latest versions from source. However, we do the
# same in our virtualenv, so it's not needed and just increases the # same in our virtualenv, so it's not needed and just increases the
# size of the image. # size of the image.
os.environ['DIB_INSTALLTYPE_pip_and_virtualenv'] = 'package' os.environ['DIB_INSTALLTYPE_pip_and_virtualenv'] = 'package'
args = parser.parse_args()
if args.release: if args.release:
os.environ['DIB_RELEASE'] = args.release os.environ['DIB_RELEASE'] = args.release
if args.branch: if args.branch: