openstack/tripleo-operator-ansible
Code Issues Proposed changes

Merge "Include tripleo_generate_scripts for undercloud install"

Browse Source
This commit is contained in:
Zuul 2020-04-01 18:21:19 +00:00 committed by Gerrit Code Review
commit 85271df1d3
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/tripleo_undercloud_install/README.md
View File

@ -14,6 +14,7 @@ Role Variables
* `tripleo_undercloud_install_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false * `tripleo_undercloud_install_debug`: (Boolean) Flag used to enable the debug version of commands. Default: false
* `tripleo_undercloud_install_dry_run`: (Boolean) Flag to add --dry-run to the install. Default: false * `tripleo_undercloud_install_dry_run`: (Boolean) Flag to add --dry-run to the install. Default: false
* `tripleo_undercloud_install_force_stack_update`: (Boolean) Flag to add --force-stack-update to the install. Default: false * `tripleo_undercloud_install_force_stack_update`: (Boolean) Flag to add --force-stack-update to the install. Default: false
* `tripleo_undercloud_install_generate_scripts`: (Boolean) Write out a shell script that can be used to reproduce the command being executed. By default uses the value of `tripleo_generate_scripts` or False if `tripleo_generate_scripts` is not defined.
* `tripleo_undercloud_install_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}" * `tripleo_undercloud_install_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}"
* `tripleo_undercloud_install_inflight_validations`: (Boolean) Flag to add --inflight-validations to the install. Default: false * `tripleo_undercloud_install_inflight_validations`: (Boolean) Flag to add --inflight-validations to the install. Default: false
* `tripleo_undercloud_install_log_combine`: (Boolean) Flag to combine stdout and stderr in the logfile. Default: true * `tripleo_undercloud_install_log_combine`: (Boolean) Flag to combine stdout and stderr in the logfile. Default: true

1
roles/tripleo_undercloud_install/defaults/main.yml
View File

@ -4,6 +4,7 @@ openstack_bin: openstack
tripleo_undercloud_install_debug: false tripleo_undercloud_install_debug: false
tripleo_undercloud_install_dry_run: false tripleo_undercloud_install_dry_run: false
tripleo_undercloud_install_force_stack_update: false tripleo_undercloud_install_force_stack_update: false
tripleo_undercloud_install_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}"
tripleo_undercloud_install_home_dir: "{{ ansible_env.HOME }}" tripleo_undercloud_install_home_dir: "{{ ansible_env.HOME }}"
tripleo_undercloud_install_inflight_validations: false tripleo_undercloud_install_inflight_validations: false
tripleo_undercloud_install_log_combine: true tripleo_undercloud_install_log_combine: true

8
roles/tripleo_undercloud_install/tasks/main.yml
View File

@ -10,6 +10,7 @@
{{ tripleo_undercloud_install_yes | ternary("--yes", '') }} {{ tripleo_undercloud_install_yes | ternary("--yes", '') }}
{{ tripleo_undercloud_install_log_output | ternary((">" ~ tripleo_undercloud_install_log), '') }} {{ tripleo_undercloud_install_log_output | ternary((">" ~ tripleo_undercloud_install_log), '') }}
{{ tripleo_undercloud_install_log_combine | ternary("2>&1", '') }} {{ tripleo_undercloud_install_log_combine | ternary("2>&1", '') }}
_install_env: {}
- name: Preserve existing log file if exists - name: Preserve existing log file if exists
timestamp_file: timestamp_file:
@ -21,6 +22,13 @@
var: _install_cmd var: _install_cmd
when: tripleo_undercloud_install_debug|bool when: tripleo_undercloud_install_debug|bool
- name: Write reproducer script
tripleo_shell_script:
dest: "{{ tripleo_undercloud_install_home_dir }}/undercloud_install.sh"
shell_command: "{{ _install_cmd }}"
shell_environment: "{{ _install_env }}"
when: tripleo_undercloud_install_generate_scripts|bool
- name: undercloud install - name: undercloud install
shell: "{{ _install_cmd }}" # noqa 305 shell: "{{ _install_cmd }}" # noqa 305
args: args: