From f2a3f86c9cb8eecf2ddfae8991e20ae9dafb0c53 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 17 Jul 2018 09:49:52 +0100
Subject: [PATCH] tasks: Record a venv_tag local fact for distro installations

Distro installations do not deploy virtual environments but they still
need a local venv_tag deployed. The reason for this is because this fact
is used by the integration repo to determine if the keystone software is
the same across all nodes in the keystone_all group so we can safely run
the DB migration.

Change-Id: I9bab11b3c643f2411d78267aa6114081fe76b9ef
---
 tasks/keystone_install.yml        | 11 +++++++++++
 tasks/keystone_install_source.yml |  7 -------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/tasks/keystone_install.yml b/tasks/keystone_install.yml
index 03623e21..12adf819 100644
--- a/tasks/keystone_install.yml
+++ b/tasks/keystone_install.yml
@@ -99,6 +99,17 @@
   include_tasks: keystone_install_source.yml
   when: keystone_install_method == 'source'
 
+# TODO(hwoarang): We need to have a venv_tag local fact deployed since we use it in the
+# integration repo to determine if keystone software is the same across all nodes in the
+# keystone_all group so we can safely run the DB migration. See
+# https://github.com/openstack/openstack-ansible/blob/master/playbooks/os-keystone-install.yml
+- name: Record the venv tag deployed
+  ini_file:
+    dest: "/etc/ansible/facts.d/openstack_ansible.fact"
+    section: keystone
+    option: venv_tag
+    value: "{{ keystone_venv_tag }}"
+
 - name: Initialise the upgrade facts
   ini_file:
     dest: "/etc/ansible/facts.d/openstack_ansible.fact"
diff --git a/tasks/keystone_install_source.yml b/tasks/keystone_install_source.yml
index cf7145f2..5d1a4f04 100644
--- a/tasks/keystone_install_source.yml
+++ b/tasks/keystone_install_source.yml
@@ -110,10 +110,3 @@
   when: keystone_get_venv  is changed
   tags:
     - skip_ansible_lint
-
-- name: Record the venv tag deployed
-  ini_file:
-    dest: "/etc/ansible/facts.d/openstack_ansible.fact"
-    section: keystone
-    option: venv_tag
-    value: "{{ keystone_venv_tag }}"