-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
OpenStack: automatically populate RHCOS image #2473
Changes from all commits
73b7cac
8c78182
ff961c1
545daea
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,12 +10,17 @@ variable "openstack_master_root_volume_size" { | |
description = "The size of the volume in gigabytes for the root block device of master nodes." | ||
} | ||
|
||
variable "openstack_base_image" { | ||
variable "openstack_base_image_name" { | ||
type = string | ||
default = "rhcos" | ||
description = "Name of the base image to use for the nodes." | ||
Fedosin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
variable "openstack_base_image_url" { | ||
type = string | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need a default value, otherwise it fails with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Funny thing, I did that but forgot to |
||
default = "" | ||
description = "URL of the base image to use for the nodes." | ||
} | ||
|
||
variable "openstack_credentials_auth_url" { | ||
type = string | ||
default = "" | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be simplified to
var.openstack_base_image_url != ""
right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather leave it like that, just in case the user exports
TF_VAR_openstack_base_image_url
. We've had an issue in our CI where a previous version of this patch created a duplicate rhcos image, it caused all the jobs to fail.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this is an optional check to prevent possible regressions that can break our ci