Skip to content

Commit 6ddab8b

Browse files
committed
Merge branch 'packer-install-yq' into 'master'
feat: Make configuration management more reliable in the TF-template: * install the yq package to AMI in order to get rid of `sed`-instructions * remove a prepared copy of the Joe configuration file, use the latest version from the repository instead See merge request postgres-ai/database-lab!366
2 parents 1644a34 + 126acbf commit 6ddab8b

File tree

3 files changed

+5
-178
lines changed

3 files changed

+5
-178
lines changed

Diff for: packer/install-prereqs.sh

+5
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,8 @@ sudo /usr/local/bin/func-e use 1.19.1 # https://www.envoyproxy.io/docs/envoy/lat
4343

4444
#install s3fs
4545
sudo apt install s3fs
46+
47+
#install yq
48+
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
49+
sudo add-apt-repository ppa:rmescandon/yq
50+
sudo apt update && sudo apt install yq -y

Diff for: packer/joe.yml

-173
This file was deleted.

Diff for: packer/template.json.pkr.hcl

-5
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ build {
4848
destination = "/home/ubuntu/envoy.yaml"
4949
}
5050

51-
provisioner "file"{
52-
source = "joe.yml"
53-
destination = "/home/ubuntu/joe.yml"
54-
}
55-
5651
provisioner "shell" {
5752
environment_vars = ["dle_version=${var.dle_version}"]
5853
scripts = ["${path.root}/install-prereqs.sh", "${path.root}/install-envoy.sh"]

0 commit comments

Comments
 (0)