Skip to content

Commit 6dc1484

Browse files
authored
Merge pull request #48 from remerge/CORE-506
Load Leaseweb root credentials from API
2 parents 37cae97 + 175f6ba commit 6dc1484

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

google/kubernetes/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "cluster" {
22
source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
3-
version = "v31.0.0"
3+
version = "v32.0.3"
44

55
project_id = var.project
66
name = var.name

google/static-website/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ locals {
55

66
module "website" {
77
source = "terraform-google-modules/cloud-storage/google"
8-
version = "6.0.0"
8+
version = "6.0.1"
99

1010
project_id = var.project
1111
names = [

netbox/device/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ data "netbox_cluster" "main" {
4949
resource "netbox_device_interface" "main" {
5050
count = var.interface != null ? 1 : 0
5151
device_id = netbox_device.main.id
52-
type = "10gbase-t"
52+
type = var.interface_type
5353
name = var.interface
5454
tags = local.tags
5555

netbox/device/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ variable "interface" {
5555
default = null
5656
}
5757

58+
variable "interface_type" {
59+
type = string
60+
default = "10gbase-t"
61+
}
62+
5863
variable "ip_address" {
5964
type = string
6065
default = null

op/host/leaseweb/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ data "leaseweb_dedicated_server_credential" "main" {
44
username = "admin"
55
}
66

7+
data "leaseweb_dedicated_server_credential" "root" {
8+
dedicated_server_id = var.leaseweb_id
9+
type = "OPERATING_SYSTEM"
10+
username = "root"
11+
}
12+
713
resource "onepassword_item" "gc" {
814
vault = var.vault
915
title = var.hostname
@@ -79,7 +85,7 @@ resource "onepassword_item" "gc" {
7985
field {
8086
label = "password"
8187
type = "CONCEALED"
82-
value = var.os_root_password
88+
value = data.leaseweb_dedicated_server_credential.root.password
8389
}
8490
}
8591
}

op/host/leaseweb/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,3 @@ variable "netbox_id" {
1717
variable "leaseweb_id" {
1818
type = string
1919
}
20-
21-
variable "os_root_password" {
22-
type = string
23-
sensitive = true
24-
}

0 commit comments

Comments
 (0)