search

ManageIQ / manageiq-documentation

Documentation for the ManageIQ Management Platform
https://www.manageiq.org/docs/
Other
38 stars 113 forks source link

Document the steps for backup and restore of appliances #1740

Closed bdunne closed 1 year ago

miq-bot commented 1 year ago

Checked commit https://github.com/bdunne/manageiq-documentation/commit/97a6aeb9f8c90638829a2e31b8f76b0e12264e85 with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint 1 file checked, 1 offense detected

**

Fryguy commented 1 year ago

I will have to manually backport this one, so the prior goes to the right location

dehawkins512 commented 1 year ago

@miq-bot add_labels petrosian/yes?,oparin/yes?,najdorf/yes?,quinteros/yes?

Fryguy commented 1 year ago

@bdunne A conflict occurred during the backport of this pull request to quinteros.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the quinteros branch in order to resolve this.

Conflict details:

diff --cc _data/site_menu.yml
index 1e0d476f,263af274..00000000
--- a/_data/site_menu.yml
+++ b/_data/site_menu.yml
@@@ -4,38 -4,42 +4,47 @@@ installation
    title: Installation
    children:
      - title: Amazon Web Services (AWS)
 -      path: "/docs/reference/latest/installing_on_aws/index.html"
 +      path: "/docs/reference/quinteros/installing_on_aws/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Amazon Web Services (AWS)"
      - title: Kubernetes
 -      path: "/docs/reference/latest/installing_on_kubernetes/index.html"
 +      path: "/docs/reference/quinteros/installing_on_kubernetes/index.html"
        desc: "How to install and configure ManageIQ on Kubernetes"
      - title: IBM Cloud
 -      path: "/docs/reference/latest/installing_on_ibm_cloud/index.html"
 +      path: "/docs/reference/quinteros/installing_on_ibm_cloud/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on IBM Cloud"
      - title: Microsoft Azure
 -      path: "/docs/reference/latest/installing_on_microsoft_azure/index.html"
 +      path: "/docs/reference/quinteros/installing_on_microsoft_azure/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Microsoft Azure"
      - title: Google Compute Engine
 -      path: "/docs/reference/latest/installing_on_google_compute_engine/index.html"
 +      path: "/docs/reference/quinteros/installing_on_google_compute_engine/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Google Compute Engine"
      - title: VMware vSphere
 -      path: "/docs/reference/latest/installing_on_vmware_vsphere/index.html"
 +      path: "/docs/reference/quinteros/installing_on_vmware_vsphere/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on VMware vSphere"
      - title: Red Hat Enterprise OpenStack Platform
 -      path: "/docs/reference/latest/installing_on_red_hat_enterprise_linux_openstack_platform/index.html"
 +      path: "/docs/reference/quinteros/installing_on_red_hat_enterprise_linux_openstack_platform/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Red Hat OpenStack Platform"
      - title: Red Hat Enterprise Virtualization
 -      path: "/docs/reference/latest/installing_on_red_hat_virtualization/index.html"
 +      path: "/docs/reference/quinteros/installing_on_red_hat_virtualization/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Red Hat Enterprise Virtualization"
      - title: Microsoft System Center Virtual Machine Manager (SCVMM)
 -      path: "/docs/reference/latest/installing_on_scvmm/index.html"
 +      path: "/docs/reference/quinteros/installing_on_scvmm/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Microsoft System Center Virtual Machine Manager (SCVMM)"

- upgrading:
-   title: Upgrading
+ appliances:
+   title: Appliances
    children:
++<<<<<<< HEAD
 +    - title: Appliances
 +      path: "/docs/reference/quinteros/upgrading_appliances/index.html"
++=======
+     - title: Backup and Restore
+       path: "/docs/reference/latest/appliances/backup_and_restore.html"
+       desc: "How to backup and restore appliances"
+     - title: Upgrading
+       path: "/docs/reference/latest/appliances/upgrading.html"
+       prior: "/docs/reference/oparin/upgrading_appliances/index.html"
++>>>>>>> 08b7e1a7 (Merge pull request #1740 from bdunne/appliance_backup_restore)
        desc: "How to upgrade appliances"

  configuration:
Fryguy commented 1 year ago

Manual backport to quinteros via c4aca4a419f918f0e1b183e4730b16dd344c5ad7

commit c4aca4a419f918f0e1b183e4730b16dd344c5ad7 (HEAD -> quinteros, upstream/quinteros)
Author: Jason Frey <fryguy9@gmail.com>
Date:   Thu Sep 14 10:30:07 2023 -0400

    Merge pull request #1740 from bdunne/appliance_backup_restore

    Document the steps for backup and restore of appliances

    (cherry picked from commit 08b7e1a78dfc043e100517d26135d3a9fdd90149)
Fryguy commented 1 year ago

@bdunne A conflict occurred during the backport of this pull request to petrosian.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the petrosian branch in order to resolve this.

Conflict details:

diff --cc _data/site_menu.yml
index 326b020c,263af274..00000000
--- a/_data/site_menu.yml
+++ b/_data/site_menu.yml
@@@ -4,38 -4,42 +4,47 @@@ installation
    title: Installation
    children:
      - title: Amazon Web Services (AWS)
 -      path: "/docs/reference/latest/installing_on_aws/index.html"
 +      path: "/docs/reference/petrosian/installing_on_aws/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Amazon Web Services (AWS)"
      - title: Kubernetes
 -      path: "/docs/reference/latest/installing_on_kubernetes/index.html"
 +      path: "/docs/reference/petrosian/installing_on_kubernetes/index.html"
        desc: "How to install and configure ManageIQ on Kubernetes"
      - title: IBM Cloud
 -      path: "/docs/reference/latest/installing_on_ibm_cloud/index.html"
 +      path: "/docs/reference/petrosian/installing_on_ibm_cloud/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on IBM Cloud"
      - title: Microsoft Azure
 -      path: "/docs/reference/latest/installing_on_microsoft_azure/index.html"
 +      path: "/docs/reference/petrosian/installing_on_microsoft_azure/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Microsoft Azure"
      - title: Google Compute Engine
 -      path: "/docs/reference/latest/installing_on_google_compute_engine/index.html"
 +      path: "/docs/reference/petrosian/installing_on_google_compute_engine/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Google Compute Engine"
      - title: VMware vSphere
 -      path: "/docs/reference/latest/installing_on_vmware_vsphere/index.html"
 +      path: "/docs/reference/petrosian/installing_on_vmware_vsphere/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on VMware vSphere"
      - title: Red Hat Enterprise OpenStack Platform
 -      path: "/docs/reference/latest/installing_on_red_hat_enterprise_linux_openstack_platform/index.html"
 +      path: "/docs/reference/petrosian/installing_on_red_hat_enterprise_linux_openstack_platform/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Red Hat OpenStack Platform"
      - title: Red Hat Enterprise Virtualization
 -      path: "/docs/reference/latest/installing_on_red_hat_virtualization/index.html"
 +      path: "/docs/reference/petrosian/installing_on_red_hat_virtualization/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Red Hat Enterprise Virtualization"
      - title: Microsoft System Center Virtual Machine Manager (SCVMM)
 -      path: "/docs/reference/latest/installing_on_scvmm/index.html"
 +      path: "/docs/reference/petrosian/installing_on_scvmm/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Microsoft System Center Virtual Machine Manager (SCVMM)"

- upgrading:
-   title: Upgrading
+ appliances:
+   title: Appliances
    children:
++<<<<<<< HEAD
 +    - title: Appliances
 +      path: "/docs/reference/petrosian/upgrading_appliances/index.html"
++=======
+     - title: Backup and Restore
+       path: "/docs/reference/latest/appliances/backup_and_restore.html"
+       desc: "How to backup and restore appliances"
+     - title: Upgrading
+       path: "/docs/reference/latest/appliances/upgrading.html"
+       prior: "/docs/reference/oparin/upgrading_appliances/index.html"
++>>>>>>> 08b7e1a7 (Merge pull request #1740 from bdunne/appliance_backup_restore)
        desc: "How to upgrade appliances"

  configuration:
Fryguy commented 1 year ago

Manual backport to petrosian via 3f6812d3d1421a33532aecc2a2ee437d71816d87

commit 3f6812d3d1421a33532aecc2a2ee437d71816d87 (HEAD -> petrosian, upstream/petrosian)
Author: Jason Frey <fryguy9@gmail.com>
Date:   Thu Sep 14 10:30:07 2023 -0400

    Merge pull request #1740 from bdunne/appliance_backup_restore

    Document the steps for backup and restore of appliances

    (cherry picked from commit 08b7e1a78dfc043e100517d26135d3a9fdd90149)
Fryguy commented 1 year ago

Manual backport to oparin via 2584ddc6d3347b6d60558932657d7bedc6be72d6

commit 2584ddc6d3347b6d60558932657d7bedc6be72d6 (HEAD -> oparin, upstream/oparin)
Author: Jason Frey <fryguy9@gmail.com>
Date:   Thu Sep 14 10:30:07 2023 -0400

    Merge pull request #1740 from bdunne/appliance_backup_restore

    Document the steps for backup and restore of appliances

    (cherry picked from commit 08b7e1a78dfc043e100517d26135d3a9fdd90149)
Fryguy commented 1 year ago

@bdunne A conflict occurred during the backport of this pull request to najdorf.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the najdorf branch in order to resolve this.

Conflict details:

diff --cc _data/site_menu.yml
index 8921a81c,263af274..00000000
--- a/_data/site_menu.yml
+++ b/_data/site_menu.yml
@@@ -4,38 -4,42 +4,47 @@@ installation
    title: Installation
    children:
      - title: Amazon Web Services (AWS)
 -      path: "/docs/reference/latest/installing_on_aws/index.html"
 +      path: "/docs/reference/najdorf/installing_on_aws/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Amazon Web Services (AWS)"
      - title: Kubernetes
 -      path: "/docs/reference/latest/installing_on_kubernetes/index.html"
 +      path: "/docs/reference/najdorf/installing_on_kubernetes/index.html"
        desc: "How to install and configure ManageIQ on Kubernetes"
      - title: IBM Cloud
 -      path: "/docs/reference/latest/installing_on_ibm_cloud/index.html"
 +      path: "/docs/reference/najdorf/installing_on_ibm_cloud/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on IBM Cloud"
      - title: Microsoft Azure
 -      path: "/docs/reference/latest/installing_on_microsoft_azure/index.html"
 +      path: "/docs/reference/najdorf/installing_on_microsoft_azure/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Microsoft Azure"
      - title: Google Compute Engine
 -      path: "/docs/reference/latest/installing_on_google_compute_engine/index.html"
 +      path: "/docs/reference/najdorf/installing_on_google_compute_engine/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Google Compute Engine"
      - title: VMware vSphere
 -      path: "/docs/reference/latest/installing_on_vmware_vsphere/index.html"
 +      path: "/docs/reference/najdorf/installing_on_vmware_vsphere/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on VMware vSphere"
      - title: Red Hat Enterprise OpenStack Platform
 -      path: "/docs/reference/latest/installing_on_red_hat_enterprise_linux_openstack_platform/index.html"
 +      path: "/docs/reference/najdorf/installing_on_red_hat_enterprise_linux_openstack_platform/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Red Hat OpenStack Platform"
      - title: Red Hat Enterprise Virtualization
 -      path: "/docs/reference/latest/installing_on_red_hat_virtualization/index.html"
 +      path: "/docs/reference/najdorf/installing_on_red_hat_virtualization/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Red Hat Enterprise Virtualization"
      - title: Microsoft System Center Virtual Machine Manager (SCVMM)
 -      path: "/docs/reference/latest/installing_on_scvmm/index.html"
 +      path: "/docs/reference/najdorf/installing_on_scvmm/index.html"
        desc: "How to install and configure the ManageIQ Management Engine appliance on Microsoft System Center Virtual Machine Manager (SCVMM)"

- upgrading:
-   title: Upgrading
+ appliances:
+   title: Appliances
    children:
++<<<<<<< HEAD
 +    - title: Appliances
 +      path: "/docs/reference/najdorf/upgrading_appliances/index.html"
++=======
+     - title: Backup and Restore
+       path: "/docs/reference/latest/appliances/backup_and_restore.html"
+       desc: "How to backup and restore appliances"
+     - title: Upgrading
+       path: "/docs/reference/latest/appliances/upgrading.html"
+       prior: "/docs/reference/oparin/upgrading_appliances/index.html"
++>>>>>>> 08b7e1a7 (Merge pull request #1740 from bdunne/appliance_backup_restore)
        desc: "How to upgrade appliances"

  configuration:
Fryguy commented 1 year ago

Manual backport to najdorf via eca1a4b4b3d4c779556be689409aeeb64a4fe93f

commit eca1a4b4b3d4c779556be689409aeeb64a4fe93f (HEAD -> najdorf, upstream/najdorf)
Author: Jason Frey <fryguy9@gmail.com>
Date:   Thu Sep 14 10:30:07 2023 -0400

    Merge pull request #1740 from bdunne/appliance_backup_restore

    Document the steps for backup and restore of appliances

    (cherry picked from commit 08b7e1a78dfc043e100517d26135d3a9fdd90149)