diff --git a/roles/main_infra/defaults/main.yml b/roles/main_infra/defaults/main.yml index 9883a37..f7c39b7 100644 --- a/roles/main_infra/defaults/main.yml +++ b/roles/main_infra/defaults/main.yml @@ -1,3 +1,4 @@ +aws_profile: "default" dynamodb_table: "poa-terraform-lock" bucket: "poa-terraform-state" terraform_location: "/usr/local/bin/terraform" diff --git a/roles/main_infra/templates/hosts.tf.j2 b/roles/main_infra/templates/hosts.tf.j2 index 4ed7daa..43ff904 100644 --- a/roles/main_infra/templates/hosts.tf.j2 +++ b/roles/main_infra/templates/hosts.tf.j2 @@ -54,7 +54,8 @@ resource "aws_autoscaling_group" "explorer-{{key}}" { max_size = "4" min_size = "1" desired_capacity = "1" -{% if value['USE_PLACEMENT_GROUP']|default('true') == "true" %} placement_group = "${var.prefix}-{{key}}-explorer-pg" {% endif %} +{% if value['USE_PLACEMENT_GROUP']|default('true') == "true" %} placement_group = "${var.prefix}-{{key}}-explorer-pg" +{% endif %} launch_configuration = "${aws_launch_configuration.explorer.name}" vpc_zone_identifier = ["${aws_subnet.default.id}"] availability_zones = ["${data.aws_availability_zones.available.names}"] diff --git a/roles/main_software/defaults/main.yml b/roles/main_software/defaults/main.yml index 4dbd287..4c2aef8 100644 --- a/roles/main_software/defaults/main.yml +++ b/roles/main_software/defaults/main.yml @@ -1 +1,2 @@ +aws_profile: "default" skip_fetch: false diff --git a/roles/main_software/tasks/main.yml b/roles/main_software/tasks/main.yml index 94bbae5..279be77 100644 --- a/roles/main_software/tasks/main.yml +++ b/roles/main_software/tasks/main.yml @@ -88,7 +88,7 @@ chain_env: "{{ lookup('aws_ssm', path, aws_profile=aws_profile, shortnames=true, bypath=true, recursive=true ) }}" vars: path: "/{{ prefix }}/{{ chain }}" - when: aws_profile is defined + when: aws_access_key is undefined - name: Make config variables lowercase set_fact: @@ -165,7 +165,7 @@ - name: Fix bug with favicon replace: regexp: 'favicon-[a-z0-9]+?\.ico' - replace: "favicon.ico" + replace: "images/favicon.ico" path: "blockscout-{{ chain }}/apps/block_scout_web/priv/static/cache_manifest.json" - name: Upload Blockscout to S3