Skip to content

Commit

Permalink
Let external plugin determine workspace ansible version
Browse files Browse the repository at this point in the history
  • Loading branch information
dometto committed Oct 1, 2024
1 parent bf35afc commit 3a17b0a
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion ubuntu/focal-desktop/variables.auto.pkrvars.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ container_base_img = "src-base-ubuntu_focal-desktop:latest"
vagrant_base_img = "ubuntu/focal64"
extra_packages = "gdm3 xfce4 xrdp xauth xorgxrdp"
extra_post_commands = "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
workspace_ansible_version = "9.1.0"
1 change: 0 additions & 1 deletion ubuntu/focal/variables.auto.pkrvars.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ img_tag = "ubuntu_focal"
container_base_img = "src-base-ubuntu_focal:latest"
vagrant_base_img = "ubuntu/focal64"
extra_packages = ""
workspace_ansible_version = "9.1.0"
1 change: 0 additions & 1 deletion ubuntu/jammy-desktop/variables.auto.pkrvars.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ container_base_img = "src-base-ubuntu_jammy-desktop:latest"
vagrant_base_img = "ubuntu/jammy64"
extra_packages = "gdm3 xfce4 xrdp xauth xorgxrdp"
extra_post_commands = "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
workspace_ansible_version = "9.1.0"
1 change: 0 additions & 1 deletion ubuntu/jammy/variables.auto.pkrvars.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ img_tag = "ubuntu_jammy"
container_base_img = "src-base-ubuntu_jammy:latest"
vagrant_base_img = "ubuntu/jammy64"
extra_packages = ""
workspace_ansible_version = "9.1.0"
6 changes: 0 additions & 6 deletions ubuntu/src-ubuntu.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ variable "img_tag_suffix" {
type = string
}

variable "workspace_ansible_version" {
default = "9.1.0"
type = string
}

variable "common_ansible_args" {
default = [
"-b",
Expand Down Expand Up @@ -117,7 +112,6 @@ local "ansible_host" {

local "dummy_plugin_args" {
expression = {
"remote_ansible_version" = "${var.workspace_ansible_version}",
"remote_plugin" = {
"script_type" = "Ansible PlayBook",
"script_folder" = "../dummy-plugin",
Expand Down

0 comments on commit 3a17b0a

Please sign in to comment.