From 93b21c437b542f955148583607a7a7ab961b2310 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 2 Jun 2017 15:25:02 +0100 Subject: [PATCH] Convert old fact format to the new format In [1] the fact format was changed, but no migration from the old format to the new format was implemented. Deployments therefore implemented using the old format will fail when upgrading to the next tag due to the appropriate fact being missing. This patch bridges the gap to ensure that minor upgrades work as expected. [1] https://review.openstack.org/#/q/Icf443a93424c9eba7b68d3279ebb48ae00602808 Change-Id: I9becdf59a36c2a1255ee51728dd764ef5dc79790 --- tasks/keystone_cleanup_old_facts.yml | 34 ++++++++++++++++++++++++++++ tasks/main.yml | 6 +++++ 2 files changed, 40 insertions(+) create mode 100644 tasks/keystone_cleanup_old_facts.yml 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