openstack/tripleo-ansible
Code Issues Proposed changes

tripleo-container-manage: remove hashed-* from default

Browse Source 
Thanks to https://review.opendev.org/#/c/706972/ (and the module
itself), we don't have hashed files anymore. The hash is now in the
container file, and we don't have 2 files anymore; which makes things
easier to understand and debug.

This patch updates the doc and the defaults.
For backward compatibility and upgrades, if a file has hashed in its
name, it's still supported and it'll be clean-up.

Change-Id: Ie01d5509a479a726adac6490a5f32ef2df2ccde6
This commit is contained in:
Emilien Macchi 2020-02-14 10:37:31 -05:00
parent 109201525f
commit 5770707777
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/roles/role-tripleo-container-manage.rst
View File

@ -96,7 +96,7 @@ Roles variables
+------------------------------------------------+-----------------------------+----------------------------+
| tripleo_container_manage_config_id | tripleo | Config ID |
+------------------------------------------------+-----------------------------+----------------------------+
| tripleo_container_manage_config_patterns | `hashed-*.json` | Bash REGEX to find configs |
| tripleo_container_manage_config_patterns | `*.json` | Bash REGEX to find configs |
+------------------------------------------------+-----------------------------+----------------------------+
| tripleo_container_manage_debug | false | Debug toggle |
+------------------------------------------------+-----------------------------+----------------------------+
@ -148,7 +148,7 @@ overrides the image setting in one-off.
name: tripleo-container-manage
vars:
tripleo_container_manage_systemd_order: true
tripleo_container_manage_config_patterns: 'hashed-haproxy.json'
tripleo_container_manage_config_patterns: 'haproxy.json'
tripleo_container_manage_config: "/var/lib/tripleo-config/container-startup-config/step_1"
tripleo_container_manage_config_id: "tripleo_step1"
tripleo_container_manage_config_overrides:

2
tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml
View File

@ -23,7 +23,7 @@ tripleo_container_manage_concurrency: 1
tripleo_container_manage_config: "/var/lib/tripleo-config/"
tripleo_container_manage_config_id: tripleo
tripleo_container_manage_config_overrides: {}
tripleo_container_manage_config_patterns: 'hashed-*.json'
tripleo_container_manage_config_patterns: '*.json'
tripleo_container_manage_debug: false
tripleo_container_manage_healthcheck_disabled: false
tripleo_container_manage_log_path: '/var/log/containers/stdouts'