From 6e6e564a4f5a92020f8220f95fe8e5fa5f27bc1c Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 17 Sep 2019 15:57:32 -0400 Subject: [PATCH] Restructure Ansible playbooks repo This commit moves all the Ansible playbooks from "bootstrap" and "backup-restore" folder into "playbooks" folder and makes necessary changes to the paths in the files. Tests done: - remote and local bootstrap controller-0 - remote and local backup - remote and local restore_platform Story: 2004761 Task: 36571 Change-Id: I2c7e2035bab4d32ba33d32dc575f3edd9565f82b Signed-off-by: Wei Zhou --- .../backup-restore/host_vars/default.yml | 52 ------------------- .../playbooks/{backup-restore => }/backup.yml | 0 playbookconfig/src/playbooks/bootstrap.yml | 29 +++++++++++ .../src/playbooks/bootstrap/bootstrap.yml | 29 ----------- .../{bootstrap => }/host_vars/default.yml | 40 ++++++++++++-- .../restore_openstack.yml | 0 .../{bootstrap => }/restore_platform.yml | 4 +- .../backup/backup-system/files/fm_alarm.py | 0 .../roles/backup/backup-system/tasks/main.yml | 14 +++-- .../roles/backup/backup-system/vars/main.yml | 0 .../roles/backup/prepare-env/tasks/main.yml | 0 .../roles/backup/prepare-env/vars/main.yml | 0 .../defaults/main.yml | 0 .../apply-bootstrap-manifest/tasks/main.yml | 0 .../tasks/bringup_flock_services.yml | 0 .../tasks/bringup_helm.yml | 0 .../tasks/bringup_kubemaster.yml | 0 .../tasks/load_images_from_archive.yml | 0 .../bringup-essential-services/tasks/main.yml | 0 .../tasks/refresh_local_dns.yml | 0 .../setup_registry_certificate_and_keys.yml | 0 .../templates/calico-cni.yaml.j2 | 0 .../templates/kubelet.conf.j2 | 0 .../templates/multus-cni.yaml.j2 | 0 .../templates/sriov-cni.yaml.j2 | 0 .../templates/sriov-plugin.yaml.j2 | 0 .../bringup-essential-services/vars/main.yml | 0 .../files/populate_initial_config.py | 0 .../bootstrap}/persist-config/tasks/main.yml | 0 .../tasks/one_time_config_tasks.yml | 0 .../tasks/shutdown_services.yml | 0 .../tasks/update_sysinv_database.yml | 0 .../bootstrap}/persist-config/vars/main.yml | 0 .../prepare-env/files/check_root_disk_size.py | 0 .../bootstrap}/prepare-env/handlers/main.yml | 0 .../prepare-env/tasks/load_patching_tasks.yml | 0 .../bootstrap}/prepare-env/tasks/main.yml | 0 .../prepare-env/tasks/restore_prep_tasks.yml | 0 .../bootstrap}/prepare-env/vars/main.yml | 0 .../bootstrap}/store-passwd/tasks/main.yml | 0 .../bootstrap}/store-passwd/vars/main.yml | 0 .../bootstrap}/validate-config/meta/main.yml | 0 .../bootstrap}/validate-config/tasks/main.yml | 0 .../tasks/validate_address.yml | 0 .../tasks/validate_address_range.yml | 0 .../validate-config/tasks/validate_url.yml | 0 .../bootstrap}/validate-config/vars/main.yml | 0 .../roles/common/tasks/main.yml | 0 .../include-override-files/tasks/main.yml | 0 .../restore-openstack/restore/tasks/main.yml | 0 .../restore-openstack/restore/vars/main.yml | 0 .../pre-restore-bootstrap/tasks/main.yml | 0 .../restore-more-data/tasks/main.yml | 0 .../restore-more-data/vars/main.yml | 0 54 files changed, 76 insertions(+), 92 deletions(-) delete mode 100644 playbookconfig/src/playbooks/backup-restore/host_vars/default.yml rename playbookconfig/src/playbooks/{backup-restore => }/backup.yml (100%) create mode 100644 playbookconfig/src/playbooks/bootstrap.yml delete mode 100644 playbookconfig/src/playbooks/bootstrap/bootstrap.yml rename playbookconfig/src/playbooks/{bootstrap => }/host_vars/default.yml (84%) rename playbookconfig/src/playbooks/{backup-restore => }/restore_openstack.yml (100%) rename playbookconfig/src/playbooks/{bootstrap => }/restore_platform.yml (80%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/backup/backup-system/files/fm_alarm.py (100%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/backup/backup-system/tasks/main.yml (97%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/backup/backup-system/vars/main.yml (100%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/backup/prepare-env/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/backup/prepare-env/vars/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/apply-bootstrap-manifest/defaults/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/apply-bootstrap-manifest/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/bringup_flock_services.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/bringup_helm.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/bringup_kubemaster.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/load_images_from_archive.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/refresh_local_dns.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/templates/calico-cni.yaml.j2 (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/templates/kubelet.conf.j2 (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/templates/multus-cni.yaml.j2 (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/templates/sriov-cni.yaml.j2 (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/templates/sriov-plugin.yaml.j2 (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/bringup-essential-services/vars/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/persist-config/files/populate_initial_config.py (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/persist-config/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/persist-config/tasks/one_time_config_tasks.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/persist-config/tasks/shutdown_services.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/persist-config/tasks/update_sysinv_database.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/persist-config/vars/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/prepare-env/files/check_root_disk_size.py (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/prepare-env/handlers/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/prepare-env/tasks/load_patching_tasks.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/prepare-env/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/prepare-env/tasks/restore_prep_tasks.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/prepare-env/vars/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/store-passwd/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/store-passwd/vars/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/validate-config/meta/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/validate-config/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/validate-config/tasks/validate_address.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/validate-config/tasks/validate_address_range.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/validate-config/tasks/validate_url.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/bootstrap}/validate-config/vars/main.yml (100%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/common/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap => }/roles/include-override-files/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/restore-openstack/restore/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{backup-restore => }/roles/restore-openstack/restore/vars/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/restore-platform}/pre-restore-bootstrap/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/restore-platform}/restore-more-data/tasks/main.yml (100%) rename playbookconfig/src/playbooks/{bootstrap/roles => roles/restore-platform}/restore-more-data/vars/main.yml (100%) diff --git a/playbookconfig/src/playbooks/backup-restore/host_vars/default.yml b/playbookconfig/src/playbooks/backup-restore/host_vars/default.yml deleted file mode 100644 index 0d4004dd0..000000000 --- a/playbookconfig/src/playbooks/backup-restore/host_vars/default.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- -# -# Copyright (c) 2019 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# Default directory where user override file(s) can be found -# -override_files_dir: "{{ lookup('env', 'HOME') }}" - -# Default directory where the backup tar file(s) can be found -# on the active controller -backup_dir: /opt/backups - -# -# The platform backup tarball will be named in this format: -# _.tgz -# -platform_backup_filename_prefix: "{{ inventory_hostname }}_platform_backup" - -# -# The stx-openstack application backup tarball will be named in this format: -# _.tgz -# -openstack_backup_filename_prefix: "{{ inventory_hostname }}_openstack_backup" - -# -# System backup tarball filename. User must provide the filename either -# in the override file or via -e option at the command line. -# -# This variable refers to the tarball that is generated by the backup -# procedure and used in the restore phase. -# -backup_filename: - -# -# An indication whether it is a full restore or partial restore. -# True: a full restore where storage partition(s) is/are wiped during -# platform restore and ceph data needs restored -# False: a partial restore where ceph data remain intact during restore -# -# This variable is used for StarlingX OpenStack application restore only -# -restore_ceph_data: false - -# -# Default directory where the system backup tarballs fetched from the -# active controller can be found -# -host_backup_dir: "{{ lookup('env', 'HOME') }}" diff --git a/playbookconfig/src/playbooks/backup-restore/backup.yml b/playbookconfig/src/playbooks/backup.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/backup.yml rename to playbookconfig/src/playbooks/backup.yml diff --git a/playbookconfig/src/playbooks/bootstrap.yml b/playbookconfig/src/playbooks/bootstrap.yml new file mode 100644 index 000000000..4f1fab637 --- /dev/null +++ b/playbookconfig/src/playbooks/bootstrap.yml @@ -0,0 +1,29 @@ +--- +# +# Copyright (c) 2019 Wind River Systems, Inc. +# +# SPDX-License-Identifier: Apache-2.0 +# +- hosts: all + # If gathering facts is really necessary, run setup task AFTER host connectivity + # check block in prepare-env role. + gather_facts: no + + vars_files: + - host_vars/default.yml + + # Main play + roles: + - include-override-files + - bootstrap/prepare-env + - { role: bootstrap/validate-config, when: not skip_play, become: yes } + - { role: bootstrap/store-passwd, when: not skip_play and save_password, become: yes } + - { role: bootstrap/apply-bootstrap-manifest, when: not skip_play and not replayed, become: yes } + - { role: bootstrap/persist-config, when: not skip_play, become: yes } + - { role: bootstrap/bringup-essential-services, when: not skip_play, become: yes } + + vars: + change_password: false + skip_play: false + replayed: false + mode: 'bootstrap' diff --git a/playbookconfig/src/playbooks/bootstrap/bootstrap.yml b/playbookconfig/src/playbooks/bootstrap/bootstrap.yml deleted file mode 100644 index 2aebd8a24..000000000 --- a/playbookconfig/src/playbooks/bootstrap/bootstrap.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# -# Copyright (c) 2019 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -- hosts: all - # If gathering facts is really necessary, run setup task AFTER host connectivity - # check block in prepare-env role. - gather_facts: no - - vars_files: - - host_vars/default.yml - - # Main play - roles: - - include-override-files - - prepare-env - - { role: validate-config, when: not skip_play, become: yes } - - { role: store-passwd, when: not skip_play and save_password, become: yes } - - { role: apply-bootstrap-manifest, when: not skip_play and not replayed, become: yes } - - { role: persist-config, when: not skip_play, become: yes } - - { role: bringup-essential-services, when: not skip_play, become: yes } - - vars: - change_password: false - skip_play: false - replayed: false - mode: 'bootstrap' diff --git a/playbookconfig/src/playbooks/bootstrap/host_vars/default.yml b/playbookconfig/src/playbooks/host_vars/default.yml similarity index 84% rename from playbookconfig/src/playbooks/bootstrap/host_vars/default.yml rename to playbookconfig/src/playbooks/host_vars/default.yml index a124526fc..12f4b2dc1 100644 --- a/playbookconfig/src/playbooks/bootstrap/host_vars/default.yml +++ b/playbookconfig/src/playbooks/host_vars/default.yml @@ -229,14 +229,46 @@ password_change_responses: # override_files_dir: "{{ lookup('env', 'HOME') }}" - # BACKUP AND RESTORE # ================== # -# Location where the platform backup tar file is placed to restore the platform. +# Location where the backup tar file is placed to perform the restore. # This location must be specified at the command line via ansible-playbook -e option. initial_backup_dir: -# Platform backup tar file. The filename must be specified at the command line via -# ansible-playbook -e option. +# This variable refers to the tar file that is generated by the backup +# procedure and used in the restore phase. The filename must be specified +# at the command line via ansible-playbook -e option. backup_filename: + +# Default directory where the backup tar file(s) can be found +# on the active controller +backup_dir: /opt/backups + +# The platform backup tarball will be named in this format: +# _.tgz +# +platform_backup_filename_prefix: "{{ inventory_hostname }}_platform_backup" + +# The stx-openstack application backup tarball will be named in this format: +# _.tgz +# +openstack_backup_filename_prefix: "{{ inventory_hostname }}_openstack_backup" + +# An indication whether it is a full restore or partial restore. +# true: a full restore where storage partition(s) is/are wiped during +# platform restore and ceph data needs restored +# false: a partial restore where ceph data remain intact during restore +# +# This variable is used for StarlingX OpenStack application restore only +# +restore_ceph_data: false + +# Default directory where the system backup tarballs fetched from the +# active controller can be found +# +host_backup_dir: "{{ lookup('env', 'HOME') }}" + +# Flag file to indicate if platform restore is in progress +# +restore_in_progress_flag: /etc/platform/.restore_in_progress diff --git a/playbookconfig/src/playbooks/backup-restore/restore_openstack.yml b/playbookconfig/src/playbooks/restore_openstack.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/restore_openstack.yml rename to playbookconfig/src/playbooks/restore_openstack.yml diff --git a/playbookconfig/src/playbooks/bootstrap/restore_platform.yml b/playbookconfig/src/playbooks/restore_platform.yml similarity index 80% rename from playbookconfig/src/playbooks/bootstrap/restore_platform.yml rename to playbookconfig/src/playbooks/restore_platform.yml index 5adf2ced6..dd8b53651 100644 --- a/playbookconfig/src/playbooks/bootstrap/restore_platform.yml +++ b/playbookconfig/src/playbooks/restore_platform.yml @@ -12,7 +12,7 @@ roles: - include-override-files - - pre-restore-bootstrap + - restore-platform/pre-restore-bootstrap vars: change_password: false @@ -28,4 +28,4 @@ roles: - include-override-files - - { role: restore-more-data, become: yes } + - { role: restore-platform/restore-more-data, become: yes } diff --git a/playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/files/fm_alarm.py b/playbookconfig/src/playbooks/roles/backup/backup-system/files/fm_alarm.py similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/files/fm_alarm.py rename to playbookconfig/src/playbooks/roles/backup/backup-system/files/fm_alarm.py diff --git a/playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/tasks/main.yml b/playbookconfig/src/playbooks/roles/backup/backup-system/tasks/main.yml similarity index 97% rename from playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/tasks/main.yml rename to playbookconfig/src/playbooks/roles/backup/backup-system/tasks/main.yml index 0042beb19..2bdab1b38 100644 --- a/playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/tasks/main.yml +++ b/playbookconfig/src/playbooks/roles/backup/backup-system/tasks/main.yml @@ -453,14 +453,18 @@ Backup tar file(s) are now available in {{ backup_dir }} on the active controller. - block: - - name: Transfer backup tar files to the local machine + - name: Transfer platform backup tar file to the local machine fetch: - src: "{{ item }}" + src: "{{ platform_backup_file_path }}" dest: "{{ host_backup_dir }}/" flat: yes - with_items: - - "{{ platform_backup_file_path }}" - - "{{ openstack_backup_file_path }}" + + - name: Transfer openstack backup tar files to the local machine if it exists + fetch: + src: "{{ openstack_backup_file_path}}" + dest: "{{ host_backup_dir }}/" + flat: yes + when: check_mariadb_pod.rc == 0 or check_openstack_uploaded.rc == 0 - name: Notify the user where the backup tar file(s) can be found debug: diff --git a/playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/vars/main.yml b/playbookconfig/src/playbooks/roles/backup/backup-system/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/backup/backup-system/vars/main.yml rename to playbookconfig/src/playbooks/roles/backup/backup-system/vars/main.yml diff --git a/playbookconfig/src/playbooks/backup-restore/roles/backup/prepare-env/tasks/main.yml b/playbookconfig/src/playbooks/roles/backup/prepare-env/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/backup/prepare-env/tasks/main.yml rename to playbookconfig/src/playbooks/roles/backup/prepare-env/tasks/main.yml diff --git a/playbookconfig/src/playbooks/backup-restore/roles/backup/prepare-env/vars/main.yml b/playbookconfig/src/playbooks/roles/backup/prepare-env/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/backup/prepare-env/vars/main.yml rename to playbookconfig/src/playbooks/roles/backup/prepare-env/vars/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/defaults/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/defaults/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/defaults/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/defaults/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/apply-bootstrap-manifest/tasks/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/apply-bootstrap-manifest/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_flock_services.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_flock_services.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_flock_services.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_helm.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_helm.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_helm.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_kubemaster.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_kubemaster.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/bringup_kubemaster.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_kubemaster.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/load_images_from_archive.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/load_images_from_archive.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/load_images_from_archive.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/load_images_from_archive.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/refresh_local_dns.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/refresh_local_dns.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/refresh_local_dns.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/refresh_local_dns.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/setup_registry_certificate_and_keys.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/calico-cni.yaml.j2 b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/calico-cni.yaml.j2 similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/calico-cni.yaml.j2 rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/calico-cni.yaml.j2 diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/kubelet.conf.j2 b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/kubelet.conf.j2 similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/kubelet.conf.j2 rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/kubelet.conf.j2 diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/multus-cni.yaml.j2 b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/multus-cni.yaml.j2 similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/multus-cni.yaml.j2 rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/multus-cni.yaml.j2 diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-cni.yaml.j2 b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/sriov-cni.yaml.j2 similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-cni.yaml.j2 rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/sriov-cni.yaml.j2 diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-plugin.yaml.j2 b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/sriov-plugin.yaml.j2 similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/templates/sriov-plugin.yaml.j2 rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/sriov-plugin.yaml.j2 diff --git a/playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/vars/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/persist-config/files/populate_initial_config.py b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/files/populate_initial_config.py similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/persist-config/files/populate_initial_config.py rename to playbookconfig/src/playbooks/roles/bootstrap/persist-config/files/populate_initial_config.py diff --git a/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/one_time_config_tasks.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/one_time_config_tasks.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/one_time_config_tasks.yml rename to playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/one_time_config_tasks.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/shutdown_services.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/shutdown_services.yml rename to playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/shutdown_services.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/update_sysinv_database.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/persist-config/tasks/update_sysinv_database.yml rename to playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/persist-config/vars/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/persist-config/vars/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/persist-config/vars/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/files/check_root_disk_size.py b/playbookconfig/src/playbooks/roles/bootstrap/prepare-env/files/check_root_disk_size.py similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/prepare-env/files/check_root_disk_size.py rename to playbookconfig/src/playbooks/roles/bootstrap/prepare-env/files/check_root_disk_size.py diff --git a/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/handlers/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/prepare-env/handlers/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/prepare-env/handlers/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/prepare-env/handlers/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/load_patching_tasks.yml b/playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/load_patching_tasks.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/load_patching_tasks.yml rename to playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/load_patching_tasks.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/restore_prep_tasks.yml b/playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/restore_prep_tasks.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/prepare-env/tasks/restore_prep_tasks.yml rename to playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/restore_prep_tasks.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/prepare-env/vars/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/prepare-env/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/prepare-env/vars/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/prepare-env/vars/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/store-passwd/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/store-passwd/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/store-passwd/tasks/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/store-passwd/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/store-passwd/vars/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/store-passwd/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/store-passwd/vars/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/store-passwd/vars/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/validate-config/meta/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/meta/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/validate-config/meta/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/validate-config/meta/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/validate_address.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address.yml rename to playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/validate_address.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address_range.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/validate_address_range.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_address_range.yml rename to playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/validate_address_range.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_url.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/validate_url.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/validate-config/tasks/validate_url.yml rename to playbookconfig/src/playbooks/roles/bootstrap/validate-config/tasks/validate_url.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/validate-config/vars/main.yml b/playbookconfig/src/playbooks/roles/bootstrap/validate-config/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/validate-config/vars/main.yml rename to playbookconfig/src/playbooks/roles/bootstrap/validate-config/vars/main.yml diff --git a/playbookconfig/src/playbooks/backup-restore/roles/common/tasks/main.yml b/playbookconfig/src/playbooks/roles/common/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/common/tasks/main.yml rename to playbookconfig/src/playbooks/roles/common/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/include-override-files/tasks/main.yml b/playbookconfig/src/playbooks/roles/include-override-files/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/include-override-files/tasks/main.yml rename to playbookconfig/src/playbooks/roles/include-override-files/tasks/main.yml diff --git a/playbookconfig/src/playbooks/backup-restore/roles/restore-openstack/restore/tasks/main.yml b/playbookconfig/src/playbooks/roles/restore-openstack/restore/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/restore-openstack/restore/tasks/main.yml rename to playbookconfig/src/playbooks/roles/restore-openstack/restore/tasks/main.yml diff --git a/playbookconfig/src/playbooks/backup-restore/roles/restore-openstack/restore/vars/main.yml b/playbookconfig/src/playbooks/roles/restore-openstack/restore/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/backup-restore/roles/restore-openstack/restore/vars/main.yml rename to playbookconfig/src/playbooks/roles/restore-openstack/restore/vars/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/pre-restore-bootstrap/tasks/main.yml b/playbookconfig/src/playbooks/roles/restore-platform/pre-restore-bootstrap/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/pre-restore-bootstrap/tasks/main.yml rename to playbookconfig/src/playbooks/roles/restore-platform/pre-restore-bootstrap/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/restore-more-data/tasks/main.yml b/playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/restore-more-data/tasks/main.yml rename to playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml diff --git a/playbookconfig/src/playbooks/bootstrap/roles/restore-more-data/vars/main.yml b/playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/vars/main.yml similarity index 100% rename from playbookconfig/src/playbooks/bootstrap/roles/restore-more-data/vars/main.yml rename to playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/vars/main.yml