Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(jvb): instance configuration includes common tags #577

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat(jvb): instance configuration includes common tags #577

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
afc3a01
feat(jvb): instance configuration includes common tags
aaronkvanmeerten Jul 25, 2024
2d55417
fix syntax
aaronkvanmeerten Jul 25, 2024
7c64944
further attempt
aaronkvanmeerten Jul 25, 2024
b5a2ae2
reduce character count
aaronkvanmeerten Jul 25, 2024
69c3dbb
missing trailing slash
aaronkvanmeerten Jul 25, 2024
08457cd
only replace tag namespace
aaronkvanmeerten Jul 25, 2024
a8db479
fix bootstrap directory reference
aaronkvanmeerten Jul 25, 2024
8e5e64b
another try
aaronkvanmeerten Jul 25, 2024
2482867
fix
aaronkvanmeerten Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions terraform/create-jvb-instance-configuration/create-jvb-instance-configuration.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,14 @@ resource "oci_core_instance_configuration" "oci_instance_configuration" {
file("${path.cwd}/${var.user_data_lib_path}/postinstall-header.sh"), # load the header
file("${path.cwd}/${var.user_data_lib_path}/postinstall-lib.sh"), # load the lib
file("${path.cwd}/${var.user_data_lib_path}/postinstall-eip-lib.sh"), # load the EIP lib
"\nexport INFRA_CONFIGURATION_REPO=${var.infra_configuration_repo}\nexport INFRA_CUSTOMIZATIONS_REPO=${var.infra_customizations_repo}\n", #repo variables
"\nexport NOMAD_FLAG=${var.nomad_flag}\n", # nomad variable
<<EOT
export INFRA_CONFIGURATION_REPO=${var.infra_configuration_repo}
export INFRA_CUSTOMIZATIONS_REPO=${var.infra_customizations_repo}
export NOMAD_FLAG=${var.nomad_flag}
INSTANCE_ID=$(curl -s curl http://169.254.169.254/opc/v1/instance/ | jq -r .id)
echo "${jsonencode(local.common_tags)}" | sed -e 's/${var.tag_namespace}\.//' > /tmp/oracle_cache-${INSTANCE_ID}
EOT
, # write the common tags to a file
file("${path.cwd}/${var.user_data_file}"), # load our customizations
file("${path.cwd}/${var.user_data_lib_path}/postinstall-footer.sh") # load the footer
]))
Expand Down