Merge pull request #3 from OdinsHat/master

Updating legacy variable substitution
fourkitchens · Dec 16, 2013 · 5f9065d · 5f9065d
2 parents 0bb1ecc + 3455eb7
commit 5f9065d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/common-tasks/mysql-secure.yml b/common-tasks/mysql-secure.yml
@@ -5,37 +5,37 @@
 # Distribution independent.
 #
 - name: MySQL | Set the root password.
- action: mysql_user user=root password=$mysql_root_password host=localhost
+ action: mysql_user user=root password={{ mysql_root_password }} host=localhost
  tags: common
 
 - name: MySQL | Config for easy access as root user
  action: template src=templates/root-my-cnf.j2 dest=/root/.my.cnf
  tags: common
 
-- name: MySQL | Delete anonymous MySQL server user for $server_hostname
- action: mysql_user user="" host="$server_hostname" state="absent"
+- name: MySQL | Delete anonymous MySQL server user for {{ server_hostname }}
+ action: mysql_user user="" host="{{ server_hostname }} state="absent"
  tags: common
 
 - name: MySQL | Delete anonymous MySQL server user for localhost
  action: mysql_user user="" state="absent"
  tags: common
 
 - name: MySQL | Secure the MySQL root user for IPV6 localhost (::1)
- action: mysql_user user="root" password="$mysql_root_password" host="::1"
+ action: mysql_user user="root" password="{{ mysql_root_password }}" host="::1"
  tags: common
 
 - name: MySQL | Secure the MySQL root user for IPV4 localhost (127.0.0.1)
- action: mysql_user user="root" password="$mysql_root_password" host="127.0.0.1"
+ action: mysql_user user="root" password="{{ mysql_root_password }}" host="127.0.0.1"
  tags: common
 
 - name: MySQL | Secure the MySQL root user for localhost domain (localhost)
- action: mysql_user user="root" password="$mysql_root_password" host="localhost"
+ action: mysql_user user="root" password="{{ mysql_root_password }}" host="localhost"
  tags: common
 
-- name: MySQL | Secure the MySQL root user for $server_hostname domain
- action: mysql_user user="root" password="$mysql_root_password" host="$server_hostname"
+- name: MySQL | Secure the MySQL root user for {{ server_hostname }} domain
+ action: mysql_user user="root" password="{{ mysql_root_password }}" host="{{ server_hostname }}"
  tags: common
 
 - name: MySQL | Remove the MySQL test database
  action: mysql_db db=test state=absent
- tags: common
+ tags: common
diff --git a/common-tasks/ubuntu-memcached.yml b/common-tasks/ubuntu-memcached.yml
@@ -5,7 +5,7 @@
 # Ubuntu only due to using apt.
 #
 - name: Memcached | Install packages
- action: apt pkg=$item state=installed
+ action: apt pkg={{ item }} state=installed
  with_items:
  # This is 3.0.4 in Ubuntu, which is listed as 'beta' on the PECL page.
  # Right now in our testing, we want to use 2.x.

diff --git a/ubuntu-10.04-lamp-dev/setup.yml b/ubuntu-10.04-lamp-dev/setup.yml
@@ -14,7 +14,7 @@
  # Apt package installation of required software.
  #
  - name: General | Install required packages.
- action: apt pkg=$item state=installed
+ action: apt pkg={{ item }} state=installed
  tags: common
  with_items:
  - php5

diff --git a/ubuntu-12.04-lamp-dev/setup.yml b/ubuntu-12.04-lamp-dev/setup.yml
@@ -14,7 +14,7 @@
  # Apt package installation of required software.
  #
  - name: General | Install required packages.
- action: apt pkg=$item state=installed
+ action: apt pkg={{ item }} state=installed
  tags: common
  with_items:
  - php5
@@ -108,7 +108,7 @@
  tags: nodejs
 
  - name: Node.js | Install nodejs and npm
- action: apt pkg=$item state=installed
+ action: apt pkg={{ item }} state=installed
  tags: nodejs
  with_items:
  - nodejs