Capgemini#331 - Changing variables in ansible roles from {{variable}}…

… to {{ variable }}
mkscala · Jun 24, 2015 · 201946c · 201946c
1 parent bef9b89
commit 201946c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/roles/haproxy/files/haproxy.tmpl b/roles/haproxy/files/haproxy.tmpl
@@ -22,13 +22,13 @@ frontend www
     bind *:80
 
     # Generated automatically by consul-template
-{{ range services }}
-    acl host_{{ .Name }} hdr(host) -i {{ .Name }}.{{ env "HAPROXY_DOMAIN" }}
-    use_backend {{ .Name }}_backend if host_{{ .Name }}
-{{ end }}
+{{range services}}
+    acl host_{{.Name}} hdr(host) -i {{.Name}}.{{env "HAPROXY_DOMAIN"}}
+    use_backend {{.Name}}_backend if host_{{.Name}}
+{{end}}
 
-{{ range services }}
-backend {{ .Name }}_backend
-{{ range service .Name }}
-   server {{ .Node }} {{ .Address }}:{{ .Port }}{{ end }}
-{{ end }}
+{{range services}}
+backend {{.Name}}_backend
+{{range service .Name}}
+   server {{.Node}} {{.Address}}:{{.Port}}{{end}}
+{{end}}
diff --git a/roles/mesos/tasks/main.yml b/roles/mesos/tasks/main.yml
@@ -43,7 +43,7 @@
 
 - name: Set Mesos Master Cluster name
   copy:
-    content: "{{mesos_cluster_name}}"
+    content: "{{ mesos_cluster_name }}"
     dest: /etc/mesos-master/cluster
     mode: 0644
   sudo: yes
@@ -133,7 +133,7 @@
 
 - name: Create Mesos Slave work area
   file:
-    dest: "{{mesos_slave_work_dir}}"
+    dest: "{{ mesos_slave_work_dir }}"
     mode: 0755
     state: directory
   sudo: yes
@@ -143,7 +143,7 @@
 
 - name: Set Mesos Slave work area
   copy:
-    content: "{{mesos_slave_work_dir}}"
+    content: "{{ mesos_slave_work_dir }}"
     dest: /etc/mesos-slave/work_dir
     mode: 0644
   sudo: yes

diff --git a/roles/zookeeper/tasks/main.yml b/roles/zookeeper/tasks/main.yml
@@ -19,7 +19,7 @@
 
 - name: Create zookeeper myid file
   copy:
-    content: "{{zookeeper_id}}"
+    content: "{{ zookeeper_id }}"
     dest: /etc/zookeeper/conf/myid
     mode: 0644
   sudo: yes

diff --git a/roles/zookeeper/templates/zoo.cfg.j2 b/roles/zookeeper/templates/zoo.cfg.j2
@@ -9,6 +9,6 @@ syncLimit=2
 {% endfor %}
 {% else %}
 {% for host in groups[zookeeper_server_group] %}
-server.{{loop.index}}={{ hostvars[host]['ansible_ssh_host'] }}:{{ zookeeper_leader_connect_port }}:{{ zookeeper_leader_election_port }}
+server.{{ loop.index }}={{ hostvars[host]['ansible_ssh_host'] }}:{{ zookeeper_leader_connect_port }}:{{ zookeeper_leader_election_port }}
 {% endfor %}
 {% endif %}