Fixed various var reference/dereference issues for 2.x.

mikolak-net · Apr 25, 2016 · a14c52e · a14c52e
1 parent c6c140d
commit a14c52e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -16,8 +16,8 @@ dependencies:
  version: "a1232f836b5514c58da381d9479640e40d874906" # includes fix for superfluous locale switch
  - role: "Stouts.timezone"
  version: "2.0.1"
- timezone_timezone: "raspi_config_timezone"
- locale_all: "raspi_config_locale"
+ timezone_timezone: "{{raspi_config_timezone}}"
+ locale_all: "{{raspi_config_locale}}"
  - role: "Stouts.hostname"
  version: "1.0.3"
- hostname_hostname: "raspi_config_hostname"
+ hostname_hostname: "{{raspi_config_hostname}}"
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -3,7 +3,7 @@
  apt: update_cache=yes upgrade=dist
  when: raspi_config_update_packages
 - include: setup_replace_user.yml
- when: raspi_config_replace_user["name"] != ''
+ when: raspi_config_replace_user['name'] != None
 - include: security_check.yml
 - name: ensure filesystem is resized
  expand_fs:

diff --git a/tasks/security_check.yml b/tasks/security_check.yml
@@ -10,7 +10,7 @@
  debug: msg="{{raspi_config_auth_test_fail_msg}}"
  when: "raspi_config_auth_test_string == auth_test.stdout"
  changed_when: "raspi_config_auth_test_string == auth_test.stdout" # for highlighting purposes
- failed_when: "raspi_config_fail_on_auth_test and raspi_config_replace_user['name'] == ''"
+ failed_when: "raspi_config_fail_on_auth_test and raspi_config_replace_user['name'] != None"
 - name: additional info
  debug: msg="{{raspi_config_auth_test_replace_info}}"
- when: "raspi_config_auth_test_string == auth_test.stdout and raspi_config_replace_user['name'] != ''"
+ when: "raspi_config_auth_test_string == auth_test.stdout and raspi_config_replace_user['name'] != None"