From 27d7a5aae58c3f6e1359e681f09cfe1836034782 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 24 Apr 2018 11:17:14 -0600 Subject: [PATCH] Fix errors in Jinja2 template Fix a typo in the Jinja2 template for etcd configuration (remove an extra double quote). Add AWS provider version information to provider.tf. Signed-off-by: Scott Lowe --- etcd/etcdv3-ansible-aws-tf/etcd.conf.j2 | 2 +- etcd/etcdv3-ansible-aws-tf/provider.tf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/etcd/etcdv3-ansible-aws-tf/etcd.conf.j2 b/etcd/etcdv3-ansible-aws-tf/etcd.conf.j2 index de05fb9..f027433 100644 --- a/etcd/etcdv3-ansible-aws-tf/etcd.conf.j2 +++ b/etcd/etcdv3-ansible-aws-tf/etcd.conf.j2 @@ -6,7 +6,7 @@ ETCD_ADVERTISE_CLIENT_URLS="http://{{ hostvars[inventory_hostname]['ansible_eth0 ETCD_INITIAL_ADVERTISE_PEER_URLS="http://{{ hostvars[inventory_hostname]['ansible_eth0']['ipv4']['address']}}:2380" ETCD_INITIAL_CLUSTER="{%- for host in groups['tag_role_etcd'] -%} {% if loop.last -%} -{{ hostvars[host]['ansible_hostname'] }}=http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:2380" +{{ hostvars[host]['ansible_hostname'] }}=http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:2380 {%- else -%} {{ hostvars[host]['ansible_hostname'] }}=http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:2380, {%- endif -%} diff --git a/etcd/etcdv3-ansible-aws-tf/provider.tf b/etcd/etcdv3-ansible-aws-tf/provider.tf index 28d3bb0..626e7ca 100644 --- a/etcd/etcdv3-ansible-aws-tf/provider.tf +++ b/etcd/etcdv3-ansible-aws-tf/provider.tf @@ -1,3 +1,4 @@ provider "aws" { - region = "${var.user_region}" + region = "${var.user_region}" + version = "~> 1.15" }