Move load_patching_tasks.yml to backup_restore playbook

Currently load_patching_tasks.yml resides in bootstrap/prepare_env/tasks
directory. As the content of this yaml file is restore specific, move it
to restore_platform directory.

Test:
 - local restore platform
 - remote restore platform

Change-Id: I2a652bad5a8d6c90c7c5cbfc1af04c986531dd90
Closes-Bug: 1845534
Signed-off-by: Wei Zhou <wei.zhou@windriver.com>
This commit is contained in:
Wei Zhou 2019-09-26 15:13:21 -04:00
parent e4494b7b0c
commit 7e59a5e134
7 changed files with 7 additions and 17 deletions

View File

@ -14,6 +14,7 @@
- common/prepare-env
- restore-platform/prepare-env
- backup-restore/transfer-file
- restore-platform/restore-sw-patches
- name: Run bootstrap playbook with restore mode
import_playbook: bootstrap.yml mode='restore'

View File

@ -43,12 +43,6 @@
# Proceed only if skip_play flag is not turned on
- block:
- block:
# Do load verification and patching if required
- include_tasks: load_patching_tasks.yml
when: mode == 'restore'
# The following parameters should exist in default.yml. If any of them is
# not available, the file is invalid.
- name: Fail if any of the mandatory configurations are not defined

View File

@ -5,7 +5,3 @@ puppet_path: /opt/platform/puppet
standard_root_disk_size: 500
supported_release_versions:
- "19.09"
patching_permdir: /opt/patching
patching_repo_permdir: /www/pages/updates
restore_patching_complete_flag: /etc/platform/.restore_patching_complete
node_is_patched_flag: /var/run/node_is_patched

View File

@ -68,7 +68,7 @@
msg: "Host {{ ansible_host }} has been unlocked. Cannot perform restore."
when: initial_config_done.stat.exists
- name: Check if restore is in progress if bootstrap is with restore mode
- name: Check if restore is in progress
stat:
path: "{{ restore_in_progress_flag }}"
register: restore_in_progress

View File

@ -1,8 +1,6 @@
---
platform_conf_path: /etc/platform
helm_charts_permdir: /opt/platform/helm_charts
patching_permdir: /opt/patching
patching_repo_permdir: /www/pages/updates
extension_permdir: /opt/extension
patch_vault_permdir: /opt/patch-vault
ldap_permdir: /var/lib/openldap-data

View File

@ -11,10 +11,6 @@
# - reboot the controller if it is required by the patching
#
- block:
- name: Set fact for restore_in_progress flag file
set_fact:
restore_in_progress_flag: /etc/platform/.restore_in_progress
- name: Set fact for patching staging dir
set_fact:
patching_staging_dir: /scratch/patching

View File

@ -0,0 +1,5 @@
---
restore_patching_complete_flag: /etc/platform/.restore_patching_complete
node_is_patched_flag: /var/run/node_is_patched
patching_permdir: /opt/patching
patching_repo_permdir: /www/pages/updates