Merge pull request #109 from genesis/98-variable-substitution

Legacy variable substitution (fix)
evolution · May 12, 2014 · 8d2364d · 8d2364d
2 parents f616378 + 4e31cff
commit 8d2364d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/provisioning/roles/common/tasks/main.yml b/provisioning/roles/common/tasks/main.yml
@@ -30,8 +30,8 @@
   sudo:           yes
 
 - name:           Install system packages
-  apt:            pkg=${item}
-  with_items:     ${system_packages}
+  apt:            pkg={{item}}
+  with_items:     system_packages
   sudo:           yes
 
 - name:           Install bower
@@ -43,13 +43,13 @@
   sudo:           yes
 
 - name:           Install PHP packages
-  apt:            pkg=${item}
-  with_items:     ${php_packages}
+  apt:            pkg={{item}}
+  with_items:     php_packages
   sudo:           yes
 
 - name:           Enable Apache modules
-  command:        a2enmod ${item}
-  with_items:     ${apache_modules}
+  command:        a2enmod {{item}}
+  with_items:     apache_modules
   sudo:           yes
 
 - name:           Check for vagrant user

diff --git a/provisioning/roles/varnish/tasks/main.yml b/provisioning/roles/varnish/tasks/main.yml
@@ -16,7 +16,7 @@
   sudo:           yes
 
 - name:           Create Varnish directory structure
-  file:           path=${item} state=directory mode=0644
+  file:           path={{item}} state=directory mode=0644
   sudo:           yes
   with_items:
     - /etc/varnish
@@ -25,7 +25,7 @@
     - /etc/varnish/conf.d/receive
 
 - name:           Copy Varnish configuration files
-  copy:           src=etc-varnish/${item} dest=/etc/varnish/${item} mode=0644
+  copy:           src=etc-varnish/{{item}} dest=/etc/varnish/{{item}} mode=0644
   sudo:           yes
   with_items:
     - conf.d/fetch/wordpress.vcl

diff --git a/provisioning/roles/wordpress/tasks/main.yml b/provisioning/roles/wordpress/tasks/main.yml
@@ -4,22 +4,22 @@
   sudo:           yes
 
 - name:           Create MySQL database
-  mysql_db:       name=${mysql.name}
+  mysql_db:       name={{mysql.name}}
 
 - name:           Create MySQL user
-  mysql_user:     name=${mysql.user} host=${mysql.host} password=${mysql.password} priv=${mysql.name}.*:GRANT,ALL
+  mysql_user:     name={{mysql.user}} host={{mysql.host}} password={{mysql.password}} priv={{mysql.name}}.*:GRANT,ALL
 
 - name:           Disable default apache site
   command:        a2dissite 000-default removes=/etc/apache2/sites-enabled/000-default
 
 - name:           Create apache vhosts
-  template:       src=vhosts/${item} dest=/etc/apache2/sites-available/${item}.${domain} mode=0644
-  with_items:     ${apache_vhosts}
+  template:       src=vhosts/{{item}} dest=/etc/apache2/sites-available/{{item}}.{{domain}} mode=0644
+  with_items:     apache_vhosts
   sudo:           true
 
 - name:           Enable apache vhosts
-  command:        a2ensite ${item}.${domain}
-  with_items:     ${apache_vhosts}
+  command:        a2ensite {{item}}.{{domain}}
+  with_items:     apache_vhosts
   sudo:           true
   notify:
     - restart apache