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.

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

Make server_configuration optionnal. #1736

3 changes: 3 additions & 0 deletions modules/build_host/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ variable "product_version" {

variable "server_configuration" {
description = "use module.<SERVER_NAME>.configuration, see the main.tf example file"
default = {
hostname = ""
}
}

variable "auto_connect_to_master" {
Expand Down
3 changes: 3 additions & 0 deletions modules/client/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ variable "product_version" {

variable "server_configuration" {
description = "use module.<SERVER_NAME>.configuration, see the main.tf example file"
default = {
hostname = ""
}
}

variable "auto_register" {
Expand Down
5 changes: 5 additions & 0 deletions modules/proxy/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ variable "product_version" {

variable "server_configuration" {
description = "use module.<SERVER_NAME>.configuration, see README_ADVANCED.md"
default = {
hostname = ""
username = "admin"
password = "admin"
}
}

variable "disable_firewall" {
Expand Down
5 changes: 5 additions & 0 deletions modules/proxy_containerized/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ variable "helm_chart_url" {

variable "server_configuration" {
description = "use module.<SERVER_NAME>.configuration, see README_ADVANCED.md"
default = {
hostname = ""
username = "admin"
password = "admin"
}
}

variable "auto_configure" {
Expand Down
1 change: 0 additions & 1 deletion modules/sshminion/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module "sshminion" {
disable_firewall = var.disable_firewall
grains = {
mirror = var.base_configuration["mirror"]
auto_connect_to_master = var.auto_connect_to_master
sles_registration_code = var.sles_registration_code
}

Expand Down
5 changes: 0 additions & 5 deletions modules/sshminion/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ variable "product_version" {
default = null
}

variable "auto_connect_to_master" {
description = "whether this minion should automatically connect to the Salt Master upon deployment"
default = false
}

variable "use_os_released_updates" {
description = "Apply all updates from SUSE Linux Enterprise repos"
default = false
Expand Down
Loading