diff --git a/tasks/keystone_cleanup_old_facts.yml b/tasks/keystone_cleanup_old_facts.yml
new file mode 100644
index 00000000..75aa3456
--- /dev/null
+++ b/tasks/keystone_cleanup_old_facts.yml
@@ -0,0 +1,34 @@
+---
+# Copyright 2017, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TODO(odyssey4me):
+# This file and the task calling it may be removed in Queens.
+
+- name: Convert the old fact format to the new fact format
+  ini_file:
+    dest: "/etc/ansible/facts.d/openstack_ansible.fact"
+    section: keystone
+    option: need_db_sync
+    value: "{{ ansible_local['keystone']['general']['need_db_sync'] | bool }}"
+
+- name: Remove the old fact file
+  file:
+    path: "/etc/ansible/facts.d/keystone.fact"
+    state: absent
+
+- name: refresh local facts
+  setup:
+    filter: ansible_local
+    gather_subset: "!all"
diff --git a/tasks/main.yml b/tasks/main.yml
index 2ed01a03..25019b46 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -56,6 +56,12 @@
   tags:
     - keystone-config
 
+- include: keystone_cleanup_old_facts.yml
+  when:
+    - "ansible_local['keystone'] is defined"
+  tags:
+    - keystone-config
+
 - include: keystone_post_install.yml
   tags:
     - keystone-config