openstack/tripleo-operator-ansible
Code Issues Proposed changes

Allow to set log-file option for container-prepare

Browse Source 
This file is useful in order to debug a failed image prepare step.

Change-Id: I6fb6321d6821b9198486757dea5f91b7636013ec
This commit is contained in:
Cédric Jeanneret 2020-04-03 09:05:07 +02:00
parent 85271df1d3
commit caa0c9cd41
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/tripleo_container_image_prepare/defaults/main.yml
View File

@ -7,6 +7,11 @@ tripleo_container_image_prepare_debug: false
tripleo_container_image_prepare_dry_run: false
tripleo_container_image_prepare_environment_files: []
tripleo_container_image_prepare_environment_directory: []
tripleo_container_image_prepare_home_dir: "{{ ansible_env.HOME }}"
tripleo_container_image_prepare_log: "{{ tripleo_container_image_prepare_home_dir }}/container_image_prepare.log"
tripleo_container_image_prepare_log_file:
tripleo_container_image_prepare_log_output: false
tripleo_container_image_prepare_log_combine: true
tripleo_container_image_prepare_output_env_file:
tripleo_container_image_prepare_roles_file:
tripleo_container_image_prepare_timeout: 1800

6
roles/tripleo_container_image_prepare/molecule/default/converge.yml
View File

@ -66,8 +66,11 @@
- file2
tripleo_container_image_prepare_environment_directory:
- dir1
tripleo_container_image_prepare_log_file: /tmp/mylog
tripleo_container_image_prepare_output_env_file: envfile
tripleo_container_image_prepare_roles_file: some_role_file
tripleo_container_image_prepare_log_output: false
tripleo_container_image_prepare_log_combine: false
- debug: var=tripleo_container_image_prepare_result.stdout
@ -77,4 +80,5 @@
that:
- tripleo_container_image_prepare_result.stdout ==
"tripleo container image prepare --environment-file file1 --environment-file file2 "
"--environment-directory dir1 --roles-file some_role_file --output-env-file envfile --dry-run --cleanup True"
"--environment-directory dir1 --roles-file some_role_file --output-env-file envfile "
"--log-file /tmp/mylog --dry-run --cleanup True"

3
roles/tripleo_container_image_prepare/tasks/main.yml
View File

@ -8,8 +8,11 @@
{{ tripleo_container_image_prepare_environment_directory | tripleo.operator.shell_arg_list('--environment-directory') }}
{{ tripleo_container_image_prepare_roles_file | ternary('--roles-file ' ~ tripleo_container_image_prepare_roles_file, '') }}
{{ tripleo_container_image_prepare_output_env_file | ternary('--output-env-file ' ~ tripleo_container_image_prepare_output_env_file, '') }}
{{ tripleo_container_image_prepare_log_file | ternary('--log-file ' ~ tripleo_container_image_prepare_log_file, '') }}
{{ tripleo_container_image_prepare_dry_run | ternary('--dry-run', '') }}
{{ tripleo_container_image_prepare_cleanup | ternary('--cleanup ' ~ tripleo_container_image_prepare_cleanup, '') }}
{{ tripleo_container_image_prepare_log_output | ternary((">" ~ tripleo_container_image_prepare_log), '') }}
{{ tripleo_container_image_prepare_log_combine | ternary("2>&1", '') }}
- name: Show the container image prepare command
debug: