From cf840ea69f68aeb5e99ff3d7232808452cb5f111 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 29 Sep 2016 14:42:03 -0500
Subject: [PATCH] Fix a few bugs.

---
 tasks/users.yml     | 2 +-
 tasks/variables.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/users.yml b/tasks/users.yml
index e9a14d7..8edde57 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -5,7 +5,7 @@
     password: "{{ item.password | default(omit) }}"
     login_host: "{{ item.login_host | default('localhost') }}"
     login_password: "{{ item.login_password | default(omit) }}"
-    login_user: "{{ item.login_user | default(postgres) }}"
+    login_user: "{{ item.login_user | default('postgres') }}"
     port: "{{ item.port | default('5432') }}"
     priv: "{{ item.priv | default(omit) }}"
     role_attr_flags: "{{ item.role_attr_flags | default(omit) }}"
diff --git a/tasks/variables.yml b/tasks/variables.yml
index 3551ff7..7756ec2 100644
--- a/tasks/variables.yml
+++ b/tasks/variables.yml
@@ -1,7 +1,7 @@
 ---
 # Variable configuration.
 - name: Include OS-specific variables (Debian).
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml"
+  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_version.split(".")[0] }}.yml"
   when: ansible_os_family == 'Debian'
 
 - name: Include OS-specific variables (RedHat).