Skip to content

Commit

Permalink
updating
Browse files Browse the repository at this point in the history
  • Loading branch information
arnol377 committed Aug 29, 2024
1 parent 5236daa commit 9335f7f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
3 changes: 2 additions & 1 deletion docker.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ module "docker" {
}
]
packer_source_type = "S3"
packer_config = "docker-base.pkr.hcl"
packer_bucket = {
name = aws_s3_bucket.assets_bucket.bucket
key = "docker-image-pipeline.zip"
Expand All @@ -57,13 +58,13 @@ module "docker" {
key = "image-pipeline-ansible-playbooks.zip"
}
playbook = "ubuntu-base.yaml"
goss_profile = "docker-base"
goss_source_type = "S3"
goss_bucket = {
name = aws_s3_bucket.assets_bucket.bucket
key = "image-pipeline-goss-testing.zip"
}
docker_test_enabled = true
goss_profile = "docker-base"
state = local.state_config
vpc_config = local.vpc_config
image = {
Expand Down
4 changes: 2 additions & 2 deletions linux.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ output "linux_iam_arn" {
value = module.amazon_linux.iam_arn
}

output "linux_parameters" {
value = keys(module.amazon_linux.parameters)
output "linux_managed_parameters" {
value = keys(module.amazon_linux.managed_parameters)
sensitive = true
}

Expand Down
1 change: 1 addition & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ data "aws_iam_policy_document" "assets_bucket_policy_document" {
type = "AWS"
identifiers = [
module.amazon_linux.iam_arn,
module.rhel.iam_arn,
module.docker.iam_arn
]
}
Expand Down
18 changes: 15 additions & 3 deletions rhel.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,21 @@ module "rhel" {
type = "PLAINTEXT"
}
]
packer_repo = data.aws_codecommit_repository.linux
ansible_repo = data.aws_codecommit_repository.ansible
goss_repo = data.aws_codecommit_repository.goss
packer_source_type = "S3"
packer_bucket = {
name = aws_s3_bucket.assets_bucket.bucket
key = "linux-image-pipeline.zip"
}
ansible_source_type = "S3"
ansible_bucket = {
name = aws_s3_bucket.assets_bucket.bucket
key = "image-pipeline-ansible-playbooks.zip"
}
goss_source_type = "S3"
goss_bucket = {
name = aws_s3_bucket.assets_bucket.bucket
key = "image-pipeline-goss-testing.zip"
}
goss_profile = "rhel-base-test"
# goss_profile = "base-test"
state = local.state_config
Expand Down

0 comments on commit 9335f7f

Please sign in to comment.