Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove BROKER_DIRECTORY from robottelo config #13027

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Remove BROKER_DIRECTORY from robottelo config #13027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions conf/broker.yaml.template
View file
Open in desktop
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`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many of us generally likes to keep conf files in robottelo root directory, so what if we could have made a broker to choose the conf file path rather than keeping it at fixed location.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can do that today, but it still wouldn't work correctly with robottelo setting it. just export BROKER_DIRECTORY=/path/to/robottelo

HOST_WORKFLOWS:
POWER_CONTROL: vm-power-operation
EXTEND: extend-vm
9 changes: 0 additions & 9 deletions robottelo/config/__init__.py
View file
Open in desktop
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
Loading