Merge "bnr - Reduce the default parameters of the /etc/rear/local.con…

…f" into stable/wallaby
openstack-archive · Oct 11, 2021 · 2926a5f · 2926a5f
2 parents 43bf976 + 43c0bde
commit 2926a5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/tripleo_ansible/roles/backup_and_restore/defaults/main.yml b/tripleo_ansible/roles/backup_and_restore/defaults/main.yml
@@ -62,6 +62,9 @@ tripleo_backup_and_restore_local_config:
   BACKUP: NETFS
   BACKUP_PROG_COMPRESS_OPTIONS: '( --gzip)'
   BACKUP_PROG_COMPRESS_SUFFIX: '".gz"'
+  OUTPUT_URL: "{{ tripleo_backup_and_restore_output_url }}"
+  ISO_PREFIX: "{{ tripleo_backup_and_restore_hostname.stdout }}"
+  BACKUP_URL: "{{ tripleo_backup_and_restore_backup_url }}"
 
 # This var is used to define the commands to be run for preparing the network
 # during the restoration phase. Because ReaR does not support ovs, it is required

diff --git a/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml b/tripleo_ansible/roles/backup_and_restore/tasks/setup_rear.yml
@@ -119,7 +119,7 @@
 
 - name: Extract OUTPUT_URL from rear config
   set_fact:
-    output_url: "{{ rear_config.content | b64decode | regex_findall('OUTPUT_URL=(.+)') | first }}"
+    output_url: "{{ ('OUTPUT_URL' in tripleo_backup_and_restore_local_config.keys())| ternary(tripleo_backup_and_restore_local_config['OUTPUT_URL'],'') }}"
   tags:
     - bar_setup_rear
 

diff --git a/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2 b/tripleo_ansible/roles/backup_and_restore/templates/local.conf.j2
@@ -5,14 +5,11 @@
 # more information and implementation details:
 # https://opendev.org/openstack/tripleo-ansible
 
-OUTPUT_URL={{ tripleo_backup_and_restore_output_url }}
-ISO_PREFIX={{ tripleo_backup_and_restore_hostname.stdout }}
-BACKUP_PROG_OPTIONS+=( --anchored --xattrs-include='*.*' --xattrs )
-BACKUP_PROG_EXCLUDE=( {{ tripleo_backup_and_restore_exclude_paths | sum(start=[]) | map('quote') | join(' ') }} )
-BACKUP_URL={{ tripleo_backup_and_restore_backup_url }}
 {% for item in (tripleo_backup_and_restore_local_config | dict2items) %}
 {{ item.key }}={{ item.value }}
 {% endfor %}
 {% if tripleo_backup_and_restore_network_preparation_commands != '()' %}
 NETWORKING_PREPARATION_COMMANDS={{ tripleo_backup_and_restore_network_preparation_commands }}
 {% endif %}
+BACKUP_PROG_OPTIONS+=( --anchored --xattrs-include='*.*' --xattrs )
+BACKUP_PROG_EXCLUDE=( {{ tripleo_backup_and_restore_exclude_paths | sum(start=[]) | map('quote') | join(' ') }} )