openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Merge "Update tripleo_undercloud_backup role"

This commit is contained in:
Zuul 2021-03-01 23:21:30 +00:00 committed by Gerrit Code Review
parent dd850c1145 b3265b8005
commit 57e5dfcfcf
4 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/tripleo_undercloud_backup/README.md
View File

@ -18,6 +18,10 @@ Role Variables
* `tripleo_undercloud_backup_generate_scripts_only`: (Boolean) Do not run the actual command - to be used in conjunction with `tripleo_undercloud_backup_generate_scripts`. By default uses the value of `tripleo_generate_scripts_only` or False if `tripleo_generate_scripts_only` is not defined.
* `tripleo_undercloud_backup_exclude_path`: (List) List of filesystems path to skip backing up. Default: []
* `tripleo_undercloud_backup_home_dir`: (String) Home directory for the undercloud user. Default: "{{ ansible_env.HOME }}"
* `tripleo_undercloud_backup_init`: (String) Flag to initialize environment for backup, using `rear` or `nfs` as args which will check for packages, install and configure ReaR or NFS server. WARNING: This flag will be deprecated and replaced by `--setup-rear` and `--setup-nfs`.
* `tripleo_undercloud_backup_setup_nfs`: (Boolean) Flag to setup the NFS server on the backup node which will install required packages and configuration.
* `tripleo_undercloud_backup_setup_rear`: (Boolean) Flag to setup ReaR on undercloud which will install and configure ReaR.
* `tripleo_undercloud_backup_extra_vars`: (String) Flag to set additional variables as JSON or as an absolute path of a JSON or YAML file type.
* `tripleo_undercloud_backup_log_combine`: (Boolean) Flag to combine stdout and stderr in the logfile. Default: true
* `tripleo_undercloud_backup_log_output`: (Boolean) Flag to log the output to a file rather than show it in the ansible output. Default: true
* `tripleo_undercloud_backup_poll`: (Integer) Number of seconds to wait between checks to see if the backup command has completed. This should be set to a value greater or equal to 1. Default: 10

4
roles/tripleo_undercloud_backup/defaults/main.yml
View File

@ -5,6 +5,10 @@ tripleo_undercloud_backup_add_path: []
tripleo_undercloud_backup_become: true
tripleo_undercloud_backup_debug: false
tripleo_undercloud_backup_exclude_path: []
tripleo_undercloud_backup_init:
tripleo_undercloud_backup_setup_nfs: false
tripleo_undercloud_backup_setup_rear: false
tripleo_undercloud_backup_extra_vars:
tripleo_undercloud_backup_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}"
tripleo_undercloud_backup_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}"
tripleo_undercloud_backup_home_dir: "{{ ansible_env.HOME }}"

71
roles/tripleo_undercloud_backup/molecule/default/converge.yml
View File

@ -47,3 +47,74 @@
assert:
that:
- tripleo_undercloud_backup_result.stdout == "undercloud backup --exclude-path /home --exclude-path /usr"
- name: Check parameter "tripleo_undercloud_backup_init_rear"
include_role:
name: "tripleo_undercloud_backup"
vars:
tripleo_undercloud_backup_init: rear
- name: Assert "tripleo_undercloud_backup_init_rear"
assert:
that:
- tripleo_undercloud_backup_result.stdout == "undercloud backup --init rear"
- name: Check parameter "tripleo_undercloud_backup_init_nfs"
include_role:
name: "tripleo_undercloud_backup"
vars:
tripleo_undercloud_backup_init: nfs
- name: Assert "tripleo_undercloud_backup_init_nfs"
assert:
that:
- tripleo_undercloud_backup_result.stdout == "undercloud backup --init nfs"
- name: Check parameter "tripleo_undercloud_backup_setup_nfs"
include_role:
name: "tripleo_undercloud_backup"
vars:
tripleo_undercloud_backup_setup_nfs: true
- name: Assert "tripleo_undercloud_backup_setup_nfs"
assert:
that:
- tripleo_undercloud_backup_result.stdout == "undercloud backup --setup-nfs"
- name: Check parameter "tripleo_undercloud_backup_setup_rear"
include_role:
name: "tripleo_undercloud_backup"
vars:
tripleo_undercloud_backup_setup_rear: true
- name: Assert "tripleo_undercloud_backup_setup_rear"
assert:
that:
- tripleo_undercloud_backup_result.stdout == "undercloud backup --setup-rear"
- name: Check parameter "tripleo_undercloud_backup_setup_rear_extra_vars_file"
include_role:
name: "tripleo_undercloud_backup"
vars:
tripleo_undercloud_backup_setup_rear: true
tripleo_undercloud_backup_extra_vars: /path/to/vars.yaml
- name: Assert "tripleo_undercloud_backup_setup_rear_extra_vars_file"
assert:
that:
- tripleo_undercloud_backup_result.stdout == "undercloud backup --setup-rear --extra-vars /path/to/vars.yaml"
- name: Check parameter "tripleo_undercloud_backup_setup_rear_extra_vars_string"
include_role:
name: "tripleo_undercloud_backup"
vars:
tripleo_undercloud_backup_setup_rear: true
tripleo_undercloud_backup_extra_vars: "{{ {'tripleo_backup_and_restore_nfs_server': '192.168.24.1'} | to_json }}"
- name: Assert "tripleo_undercloud_backup_setup_rear_extra_vars_string"
vars:
tripleo_undercloud_backup_extra_vars: "{{ {'tripleo_backup_and_restore_nfs_server': '192.168.24.1'} | to_json }}"
assert:
that:
- tripleo_undercloud_backup_result.stdout == 'undercloud backup --setup-rear --extra-vars {{ tripleo_undercloud_backup_extra_vars }}'

4
roles/tripleo_undercloud_backup/tasks/main.yml
View File

@ -5,6 +5,10 @@
{{ openstack_bin }} undercloud backup
{{ tripleo_undercloud_backup_add_path | tripleo.operator.shell_arg_list(parameter='--add-path') }}
{{ tripleo_undercloud_backup_exclude_path | tripleo.operator.shell_arg_list(parameter='--exclude-path') }}
{{ tripleo_undercloud_backup_init | tripleo.operator.shell_arg_list(parameter='--init') }}
{{ tripleo_undercloud_backup_setup_nfs | ternary('--setup-nfs', '') }}
{{ tripleo_undercloud_backup_setup_rear | ternary('--setup-rear', '') }}
{{ tripleo_undercloud_backup_extra_vars | tripleo.operator.shell_arg_list(parameter='--extra-vars') }}
{{ tripleo_undercloud_backup_log_output | ternary((">" ~ tripleo_undercloud_backup_log), '') }}
{{ tripleo_undercloud_backup_log_combine | ternary("2>&1", '') }}
_backup_env: {}