Skip to content

Commit ef5c58d

Browse files
committedOct 13, 2024
test
1 parent c98fb40 commit ef5c58d

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed
 

‎.forgejo/workflows/tofu.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
base_url: https://vault.bitwarden.com
2323
secrets: |
2424
c65f8886-f6fb-4c17-bc79-b208000604bf > arrbuntu_ip_address
25+
2dae51bd-bd65-474c-971c-b20800f22afa > aws_access_key_id
26+
287c852d-f2b5-467d-bfc4-b20800f25f52 > aws_secret_access_key
2527
a54974b8-c6b3-4df7-9042-b20800064050 > downloaders_ip_address
2628
dacbeafa-c671-4b9c-9334-b2080006f75b > init_password
2729
9ceabbd0-6492-4674-9bab-b2080006e333 > init_username
@@ -38,13 +40,7 @@ jobs:
3840
a4ed343a-bb92-4beb-a421-b2080005bf98 > virtual_environment_endpoint
3941
af0ed579-05f8-405f-b0f3-b208000620ca > vlan_gateway
4042
41-
- name: Set AWS Credentials
42-
env:
43-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
44-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
45-
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
46-
run: |
47-
echo "AWS Credentials Set"
43+
4844

4945

5046
- name: Setup OpenTofu
@@ -55,6 +51,8 @@ jobs:
5551
run: |
5652
tofu init \
5753
-var "arrbuntu_ip_address=${{ steps.bitwarden-secrets.outputs.arrbuntu_ip_address }}" \
54+
-var "aws_access_key_id=${{ steps.bitwarden-secrets.outputs.aws_access_key_id }}" \
55+
-var "aws_secret_access_key=${{ steps.bitwarden-secrets.outputs.aws_secret_access_key }}" \
5856
-var "downloaders_ip_address=${{ steps.bitwarden-secrets.outputs.downloaders_ip_address }}" \
5957
-var "init_password=${{ steps.bitwarden-secrets.outputs.init_password }}" \
6058
-var "init_username=${{ steps.bitwarden-secrets.outputs.init_username }}" \

‎terraform/kasm.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "proxmox_virtual_environment_vm" "Kasm" {
3636
# VM Disk Settings
3737
disk {
3838
datastore_id = "local-lvm"
39-
size = 152
39+
size = 151
4040
interface = "scsi0"
4141
}
4242

‎terraform/provider.tf

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ terraform {
1919
endpoints = {
2020
s3 = var.s3_endpoint
2121
}
22+
access_key = var.aws_access_key_id
23+
secret_key = var.aws_secret_access_key
2224
}
2325
}
2426

‎terraform/vars.tf

+8
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,12 @@ variable "pve2_ip_address" {
6060

6161
variable "s3_endpoint" {
6262
type = string
63+
}
64+
65+
variable "aws_secret_access_key" {
66+
type = string
67+
}
68+
69+
variable "aws_access_key_id" {
70+
type = string
6371
}

0 commit comments

Comments
 (0)
Please sign in to comment.