From 1f3ecf2a8590ab9885e4973b7902701a5abbd420 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 13 Jul 2020 10:03:03 -0400 Subject: [PATCH] container_startup_config: remove old startup config files These files aren't needed anymore, since we generate one JSON per container in its step directory. We now make sure these files don't exist so there is no confusion. Change-Id: I9674102d6b3686206eec78f8d6f4408988a69b7b --- .../ansible_plugins/modules/container_startup_config.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/ansible_plugins/modules/container_startup_config.py b/tripleo_ansible/ansible_plugins/modules/container_startup_config.py index cb4ed0740..71adb353c 100644 --- a/tripleo_ansible/ansible_plugins/modules/container_startup_config.py +++ b/tripleo_ansible/ansible_plugins/modules/container_startup_config.py @@ -16,6 +16,7 @@ # under the License. __metaclass__ = type +import glob import json import os import shutil @@ -122,9 +123,13 @@ class ContainerStartupManager: self.results['changed'] = True def _cleanup_old_configs(self): - """Cleanup old container configurations and directories. + """Cleanup old container configurations from previous releases. """ - # TODO(emilien) remove old .json in /var/lib/tripleo-config/*.json + pattern = '*docker-container-startup-config*.json' + old_configs = glob.glob(os.path.join('/var/lib/tripleo-config', + pattern)) + for config in old_configs: + os.remove(config) def main():