Commit dbce08a5 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] Prepare gerrit-adapter for gitlab.typo3.org

parent 48c69107
#cloud-config
#groups:
#- docker
#users:
#- name: gitlab-runner
# groups: docker
#apt:
# sources:
# gitlab-runner.list:
# source: 'deb https://packages.gitlab.com/runner/gitlab-runner/ubuntu/ $RELEASE main'
# keyid: F640 3F65 44A3 8863 DAA0 B6E0 3F01 618A 5131 2F3F
# keyserver: keyserver.ubuntu.com
package_upgrade: true
package_update: true
......@@ -29,6 +18,19 @@ packages:
- tree
write_files:
# Force docker 19.03 for now
# 20.x triggers cert issues, may give headaches with sysbox and the dind-images should be same version, too.
- owner: 'root:root'
path: /etc/apt/preferences.d/docker
content: |
Package: docker.io
Pin: version 19.03.*
Pin-Priority: 1000
Package: containerd
Pin: version 1.3.3-0ubuntu2
Pin-Priority: 1000
- owner: 'root:root'
path: /etc/netplan/60-floating-ip.yaml
content: |
......
......@@ -13,11 +13,15 @@ provider "hcloud" {
resource "hcloud_ssh_key" "terraform" {
name = "terraform"
public_key = file("keys/id_rsa.pub")
public_key = file("keys/terraform.pub")
}
resource "hcloud_ssh_key" "lolli_b13" {
name = "lolli b13"
public_key = file("keys/lolli_b13.pub")
resource "hcloud_ssh_key" "key1" {
name = "key1"
public_key = file("keys/key1.pub")
}
resource "hcloud_ssh_key" "key2" {
name = "key2"
public_key = file("keys/key2.pub")
}
data "hcloud_floating_ip" "gerrit_adapter_ip" {
......@@ -45,8 +49,8 @@ resource "hcloud_server" "gerrit_adapter" {
name = "gerrit-adapter"
image = "ubuntu-20.04"
server_type = "cx11"
location = "fsn1"
ssh_keys = [ hcloud_ssh_key.terraform.id, hcloud_ssh_key.lolli_b13.id ]
location = "hel1"
ssh_keys = [ hcloud_ssh_key.terraform.id, hcloud_ssh_key.key1.id, hcloud_ssh_key.key2.id ]
user_data = data.template_file.gerrit_adapter_cloudinit.rendered
}
......@@ -58,7 +62,7 @@ resource "hcloud_floating_ip_assignment" "main" {
resource "hcloud_volume" "persistent" {
name = "gerrit-adapter-persistence"
size = 10
location = "fsn1"
location = "hel1"
format = "ext4"
}
......
......@@ -74,6 +74,7 @@ resource "hcloud_server" "runner_broker" {
resource "hcloud_volume" "caches" {
name = "gitlab-runner-cache"
size = 20
location = "hel1"
server_id = hcloud_server.runner_broker.id
format = "ext4"
automount = false
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment