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

Don't set root-disk-source when using MAAS #279

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Don't set root-disk-source when using MAAS #279

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
2 changes: 1 addition & 1 deletion common/generate_bundle_base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fi

if [ -n "${MASTER_OPTS[MODEL_CONSTRAINTS]}" ]; then
juju set-model-constraints ${MASTER_OPTS[MODEL_CONSTRAINTS]}
else
elif ! ${MASTER_OPTS[HYPERCONVERGED_DEPLOYMENT]}; then
nicolasbock marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: not sure if the check should use "" in case the option is empty like above?

elif [ -n "${MASTER_OPTS[HYPERCONVERGED_DEPLOYMENT]}" ]; then

Copy link
Member Author

Choose a reason for hiding this comment

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

HYPERCONVERGED_DEPLOYMENT defaults to false (bool) and is only ever set to true otherwise

Copy link
Collaborator

Choose a reason for hiding this comment

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

LGTM

juju set-model-constraints root-disk-source=volume root-disk=20G
fi

Expand Down