Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit e8ab554

Browse files
committed
fix: fix provider config for projectspecific providers
1 parent 85e2f17 commit e8ab554

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

ansible/roles/stackhead_module_api/tasks_internal/terraform/module.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
loaded_config: "{{ ansible_facts[module.name | getstackhead.stackhead.module_vars_name] }}"
55
- set_fact:
66
loaded_terraform_providers: "{{ loaded_terraform_providers|d([]) + [tf_provider] }}"
7-
when: tf_provider.name|d("") != "" and tf_provider.vendor|d("") != "" and tf_provider.version|d("") != "" and not tf_provider.provider_per_project|d(false)|bool
7+
when: tf_provider.name|d("") != "" and tf_provider.vendor|d("") != "" and tf_provider.version|d("") != ""
88
vars:
99
tf_provider: "{{ loaded_config.terraform.provider|d({}) }}"

ansible/templates/terraform/terraform-providers.tf.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ terraform {
2323
}
2424

2525
{% for provider in loaded_terraform_providers|default([]) %}
26+
{%- if not provider.provider_per_project|d(false)|bool %}
2627
{%- if 'init' in provider %}
2728
{{ lookup('template', provider.init) }}
2829
{%- else %}
2930
provider "{{ provider.name }}{%- if provider.nameSuffix|d("") != "" %}-{{ provider.nameSuffix }}{%- endif %}" {
3031
}
3132
{%- endif %}
33+
{%- endif %}
3234
{% endfor %}
3335

3436
provider "acme" {

0 commit comments

Comments
 (0)