Skip to content

Commit

Permalink
Remove BROKER_DIRECTORY from robottelo config
Browse files Browse the repository at this point in the history
This is something that broker handles on its own and, due to import
timing, isn't handled correctly in robottelo anyway. Removing the field
and config mechanism should eliminate confusion around this behavior.

(cherry picked from commit bc53d94)
  • Loading branch information
JacobCallahan authored and web-flow committed Nov 15, 2023
1 parent ffbb6bb commit 086a50c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
4 changes: 1 addition & 3 deletions conf/broker.yaml.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
BROKER:
# The path where your broker settings and inventory are located
# If you leave it blank, the default is the output of `broker --version`
BROKER_DIRECTORY:
# Broker has its own config which you can find by running `broker --version`
HOST_WORKFLOWS:
POWER_CONTROL: vm-power-operation
EXTEND: extend-vm
9 changes: 0 additions & 9 deletions robottelo/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ def get_settings():


settings = get_settings()


if not os.getenv('BROKER_DIRECTORY'):
# set the BROKER_DIRECTORY envar so broker knows where to operate from
if _broker_dir := settings.robottelo.get('BROKER_DIRECTORY'):
logger.debug(f'Setting BROKER_DIRECTORY to {_broker_dir}')
os.environ['BROKER_DIRECTORY'] = _broker_dir


robottelo_tmp_dir = Path(settings.robottelo.tmp_dir)
robottelo_tmp_dir.mkdir(parents=True, exist_ok=True)

Expand Down

0 comments on commit 086a50c

Please sign in to comment.