From ee6b260b85950899260493dae475ca85f7ad3825 Mon Sep 17 00:00:00 2001 From: Juan Larriba Date: Wed, 22 Jun 2022 13:54:02 +0200 Subject: [PATCH] Remove the Backup and Restore ReaR Heat templates In ancient times, B&R used heat templates to deploy ReaR to the controllers. Since a long time, this has been superseded by an ansible playbook ran by openstack overcloud backup --setup-rear. Now, that feature is duplicated, so we remove the possibility of installing ReaR with heat. A deprecation notice has been submitted to stable/train in patch #847148 Related-Bug: rhbz#2097611 Change-Id: Ic01c44ba35b6d28cb45879b1006633ac1fcf8d19 (cherry picked from commit 6c290124b9ca4923d9c3b80d1265823164ccd48e) --- README.rst | 2 - ci/custom_ci_roles_data.yaml | 2 - ci/environments/scenario001-standalone.yaml | 2 - .../rear-baremetal-ansible.yaml | 109 ------------------ environments/backup-and-restore/rear.yaml | 3 - .../standalone/standalone-tripleo.yaml | 1 - environments/undercloud.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 1 - ...-heat-installed-rear-feae3174fb303416.yaml | 6 + roles/BlockStorage.yaml | 1 - roles/CellController.yaml | 1 - roles/Compute.yaml | 1 - roles/ComputeAlt.yaml | 1 - roles/ComputeDVR.yaml | 1 - roles/ComputeHCI.yaml | 1 - roles/ComputeHCIOvsDpdk.yaml | 1 - roles/ComputeHCISriov.yaml | 1 - roles/ComputeInstanceHA.yaml | 1 - roles/ComputeLiquidio.yaml | 1 - roles/ComputeLocalEphemeral.yaml | 1 - roles/ComputeOvsDpdk.yaml | 1 - roles/ComputeOvsDpdkRT.yaml | 1 - roles/ComputeOvsDpdkSriov.yaml | 1 - roles/ComputeOvsDpdkSriovRT.yaml | 1 - roles/ComputePPC64LE.yaml | 1 - roles/ComputeRBDEphemeral.yaml | 1 - roles/ComputeRealTime.yaml | 1 - roles/ComputeSriov.yaml | 1 - roles/ComputeSriovIB.yaml | 1 - roles/ComputeSriovRT.yaml | 1 - roles/ComputeVdpa.yaml | 1 - roles/Controller.yaml | 1 - roles/ControllerAllNovaStandalone.yaml | 1 - roles/ControllerNoCeph.yaml | 1 - roles/ControllerNovaStandalone.yaml | 1 - roles/ControllerOpenstack.yaml | 1 - roles/ControllerSriov.yaml | 1 - roles/ControllerStorageDashboard.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Database.yaml | 1 - roles/DistributedCompute.yaml | 1 - roles/DistributedComputeHCI.yaml | 1 - roles/DistributedComputeHCIScaleOut.yaml | 1 - roles/DistributedComputeScaleOut.yaml | 1 - roles/HciCephAll.yaml | 1 - roles/HciCephFile.yaml | 1 - roles/HciCephMon.yaml | 1 - roles/HciCephObject.yaml | 1 - roles/IronicConductor.yaml | 1 - roles/Messaging.yaml | 1 - roles/Networker.yaml | 1 - roles/NetworkerSriov.yaml | 1 - roles/Novacontrol.yaml | 1 - roles/ObjectStorage.yaml | 1 - roles/Standalone.yaml | 1 - roles/Telemetry.yaml | 1 - roles/Undercloud.yaml | 1 - roles_data.yaml | 4 - roles_data_undercloud.yaml | 1 - sample-env-generator/standalone.yaml | 2 - 60 files changed, 6 insertions(+), 176 deletions(-) delete mode 100644 deployment/backup-and-restore/rear-baremetal-ansible.yaml delete mode 100644 environments/backup-and-restore/rear.yaml create mode 100644 releasenotes/notes/remove-heat-installed-rear-feae3174fb303416.yaml diff --git a/README.rst b/README.rst index 31e6fd4274..9f542eaa10 100644 --- a/README.rst +++ b/README.rst @@ -132,7 +132,5 @@ and should be executed according to the following table: +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | octavia | | | | | | | | | X | X | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ -| rear | | X | | | | | | | | | | | -+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | Extra Firewall | | | | X | | | | | | | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ diff --git a/ci/custom_ci_roles_data.yaml b/ci/custom_ci_roles_data.yaml index 43adf82b63..58ccb0d5fd 100644 --- a/ci/custom_ci_roles_data.yaml +++ b/ci/custom_ci_roles_data.yaml @@ -165,7 +165,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog @@ -250,7 +249,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 2d3e245f6f..0d828cd983 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -24,7 +24,6 @@ resource_registry: OS::TripleO::Services::Multipathd: ../../deployment/multipathd/multipathd-container-ansible.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::Rear: ../../deployment/backup-and-restore/rear-baremetal-ansible.yaml OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -205,4 +204,3 @@ parameter_defaults: - /dev/loop4 MultipathdEnable: true NovaLibvirtVolumeUseMultipath: true - BackupAndRestoreSkipNFSTest: true diff --git a/deployment/backup-and-restore/rear-baremetal-ansible.yaml b/deployment/backup-and-restore/rear-baremetal-ansible.yaml deleted file mode 100644 index 4557c4def3..0000000000 --- a/deployment/backup-and-restore/rear-baremetal-ansible.yaml +++ /dev/null @@ -1,109 +0,0 @@ -heat_template_version: wallaby - -description: > - Install and Configure ReaR - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. Use - parameter_merge_strategies to merge it with the defaults. - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - BackupAndRestoreNFSServer: - default: '192.168.24.1' - description: The URL of NFS server to connect to - type: string - tags: - - role_specific - BackupAndRestoreSkipNFSTest: - default: false - description: Skip the ping test in case the NFS server is not up - type: boolean - tags: - - role_specific - BackupAndRestoreNFSStorageFolder: - default: '/ctl_plane_backups' - description: NFS storage folder - type: string - tags: - - role_specific - BackupAndRestoreExcludePathsCommon: - default: ['/data/*', '/tmp/*'] - description: Exclude paths commons list - type: comma_delimited_list - tags: - - role_specific - BackupAndRestoreRearSimulate: - default: false - description: Wether if rear is to run on simulation mode - type: boolean - tags: - - role_specific - BackupAndRestoreDebug: - default: false - description: Wether if rear is to run on debug mode - type: boolean - tags: - - role_specific - BackupAndRestoreHieraConfigFile: - default: '/etc/puppet/hiera.yaml' - description: Hiera configuration file path - type: string - tags: - - role_specific - BackupAndRestoreLocalConfig: - default: { - ISO_DEFAULT: '"automatic"', - USING_UEFI_BOOTLOADER: 0, - OUTPUT: 'ISO', - BACKUP: 'NETFS', - BACKUP_PROG_COMPRESS_OPTIONS: '( --gzip)', - BACKUP_PROG_COMPRESS_SUFFIX: '".gz"'} - description: Configuration that will be put into /etc/rear/local.conf - type: json - tags: - - role_specific - -outputs: - role_data: - description: Role data for ReaR - value: - service_name: rear - host_prep_tasks: - - include_role: - name: backup_and_restore - tasks_from: setup_rear - ansible_group_vars: - tripleo_backup_and_restore_nfs_server: {get_param: BackupAndRestoreNFSServer} - tripleo_backup_and_restore_storage_folder: {get_param: BackupAndRestoreNFSStorageFolder} - tripleo_backup_and_restore_exclude_paths_common: - list_concat_unique: - - {get_param: BackupAndRestoreExcludePathsCommon} - - - - str_replace: - template: 'folder/*' - params: - folder: {get_param: BackupAndRestoreNFSStorageFolder} - tripleo_backup_and_restore_rear_simulate: {get_param: BackupAndRestoreRearSimulate} - tripleo_backup_and_restore_debug: {get_param: BackupAndRestoreDebug} - tripleo_backup_and_restore_local_config: {get_param: BackupAndRestoreLocalConfig} - tripleo_backup_and_restore_skip_nfs_test: {get_param: BackupAndRestoreSkipNFSTest} - diff --git a/environments/backup-and-restore/rear.yaml b/environments/backup-and-restore/rear.yaml deleted file mode 100644 index 6aee1ffc96..0000000000 --- a/environments/backup-and-restore/rear.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# A Heat environment file which can be used to deploy ReaR -resource_registry: - OS::TripleO::Services::Rear: ../../deployment/backup-and-restore/rear-baremetal-ansible.yaml diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 087feb973c..23a379d4d6 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -106,7 +106,6 @@ resource_registry: OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml OS::TripleO::Services::Podman: ../../deployment/podman/podman-baremetal-ansible.yaml - OS::TripleO::Services::Rear: OS::Heat::None OS::TripleO::Services::Redis: OS::Heat::None OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-baremetal-ansible.yaml OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 51364f3c57..5fc6fd1c0f 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -29,7 +29,6 @@ resource_registry: OS::TripleO::Services::GnocchiApi: OS::Heat::None OS::TripleO::Services::GnocchiMetricd: OS::Heat::None OS::TripleO::Services::GnocchiStatsd: OS::Heat::None - OS::TripleO::Services::Rear: OS::Heat::None OS::TripleO::Services::Redis: OS::Heat::None OS::TripleO::Services::CinderApi: OS::Heat::None OS::TripleO::Services::CinderScheduler: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 7fc00dc343..2ea575452a 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -172,7 +172,6 @@ resource_registry: OS::TripleO::Services::OsloMessagingRpc: deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::RabbitMQ: OS::Heat::None - OS::TripleO::Services::Rear: OS::Heat::None OS::TripleO::Services::Qdr: OS::Heat::None OS::TripleO::Services::HAproxy: deployment/haproxy/haproxy-pacemaker-puppet.yaml OS::TripleO::Services::HAProxyPublicTLS: deployment/haproxy/haproxy-public-tls-inject.yaml diff --git a/releasenotes/notes/remove-heat-installed-rear-feae3174fb303416.yaml b/releasenotes/notes/remove-heat-installed-rear-feae3174fb303416.yaml new file mode 100644 index 0000000000..43e94864f4 --- /dev/null +++ b/releasenotes/notes/remove-heat-installed-rear-feae3174fb303416.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The templates to install ReaR via heat have been removed. + Rear can be installed using Ansible via the command + `openstack overcloud backup --setup-rear`. diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index d60affe3f1..42ec1889c7 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/CellController.yaml b/roles/CellController.yaml index 6a1b67190f..7809c19e8e 100644 --- a/roles/CellController.yaml +++ b/roles/CellController.yaml @@ -50,7 +50,6 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::Podman - OS::TripleO::Services::Ptp - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/Compute.yaml b/roles/Compute.yaml index a63567ae4a..058d47d37e 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -65,7 +65,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index 2e8b7d0347..9b3be8e6a5 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::NovaLibvirtAlt - OS::TripleO::Services::NovaMigrationTargetAlt - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Securetty diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index 98ff9dd0ea..578e8bf097 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -52,7 +52,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index 73c1140e14..8acb7bd61e 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml index 7fc5d8c66f..08f78b4b31 100644 --- a/roles/ComputeHCIOvsDpdk.yaml +++ b/roles/ComputeHCIOvsDpdk.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::OvsDpdkNetcontrold - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeHCISriov.yaml b/roles/ComputeHCISriov.yaml index f8dd5a838a..7dde7a18f6 100644 --- a/roles/ComputeHCISriov.yaml +++ b/roles/ComputeHCISriov.yaml @@ -51,7 +51,6 @@ - OS::TripleO::Services::NovaLibvirtGuests - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index 80e6ee4f56..3f0e0a5e45 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::PacemakerRemote - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index 3461fbbda2..3d7d38cd6f 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::LiquidioCompute - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml index ad9bdeb97b..a01e88f4c9 100644 --- a/roles/ComputeLocalEphemeral.yaml +++ b/roles/ComputeLocalEphemeral.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index 95aeb794e4..f28e217d5d 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -56,7 +56,6 @@ - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::OvsDpdkNetcontrold - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index ca2d2c312d..c4b7f97e51 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -58,7 +58,6 @@ - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::OvsDpdkNetcontrold - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index f94eb8db85..64a0b996b0 100644 --- a/roles/ComputeOvsDpdkSriov.yaml +++ b/roles/ComputeOvsDpdkSriov.yaml @@ -52,7 +52,6 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::OvsDpdkNetcontrold - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml index 2dd777b1f5..b38e90f292 100644 --- a/roles/ComputeOvsDpdkSriovRT.yaml +++ b/roles/ComputeOvsDpdkSriovRT.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::OvsDpdkNetcontrold - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index 0f8e85e20d..124e53e290 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -52,7 +52,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml index 6ebe2379fa..8b577c9199 100644 --- a/roles/ComputeRBDEphemeral.yaml +++ b/roles/ComputeRBDEphemeral.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index 52d67158ef..fca6c485a9 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -62,7 +62,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 519b162333..5e8223aa6c 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -50,7 +50,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeSriovIB.yaml b/roles/ComputeSriovIB.yaml index ac809c06cd..f3c659a389 100644 --- a/roles/ComputeSriovIB.yaml +++ b/roles/ComputeSriovIB.yaml @@ -50,7 +50,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index b343fbaa4c..53d7f3714d 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/ComputeVdpa.yaml b/roles/ComputeVdpa.yaml index 91df2c12dd..9a2106daf2 100644 --- a/roles/ComputeVdpa.yaml +++ b/roles/ComputeVdpa.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/Controller.yaml b/roles/Controller.yaml index c426f3902d..8ac4745814 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -163,7 +163,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 222f66ead7..54a2646b9e 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -108,7 +108,6 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index d380601572..5a8c7b241c 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -150,7 +150,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 8efd7a76fa..6e3b6ea42b 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -144,7 +144,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index d054643665..283c95b3a1 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -120,7 +120,6 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PlacementApi - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index fdc82569c7..8904f42f20 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -161,7 +161,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 2002c2e909..2ccad0b8d0 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -161,7 +161,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 1711f178e9..d1d03d4c18 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -161,7 +161,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/Database.yaml b/roles/Database.yaml index 4044d38ba5..3c13c10cc0 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -27,7 +27,6 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index 1df204887b..6dcf59a7b2 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index 278eab2f5f..a2353dcf56 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -63,7 +63,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml index 80ee990497..f46d5ed45e 100644 --- a/roles/DistributedComputeHCIScaleOut.yaml +++ b/roles/DistributedComputeHCIScaleOut.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml index 4b645c67ea..4dbd93e3f9 100644 --- a/roles/DistributedComputeScaleOut.yaml +++ b/roles/DistributedComputeScaleOut.yaml @@ -52,7 +52,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index e982b79e58..9872ec2eaa 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -59,7 +59,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 2af919358d..6d94f13d1a 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 18dacdb1c5..f7879663dd 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index 96596058c9..f17c53aa1b 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index bc1b22089e..3d8632d56f 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -28,7 +28,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Snmp diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index 6976984a8a..0ea4abf6a4 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -26,7 +26,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Snmp diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 0159332571..e04861d3eb 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -42,7 +42,6 @@ - OS::TripleO::Services::OctaviaWorker - OS::TripleO::Services::OVNController - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Snmp diff --git a/roles/NetworkerSriov.yaml b/roles/NetworkerSriov.yaml index fcb5c4667e..4637ffbff4 100644 --- a/roles/NetworkerSriov.yaml +++ b/roles/NetworkerSriov.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::OVNController - OS::TripleO::Services::OVNMetadataAgent - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Snmp diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index 503213fdc7..031d589d42 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::PlacementApi - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Securetty diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 77c096a6de..210f48da90 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -39,7 +39,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index d287a4f443..074e6e4fb9 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -162,7 +162,6 @@ - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::PlacementApi - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index 2fd38d0a94..3ff95d837c 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -38,7 +38,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 36339e9282..503d37d918 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -74,7 +74,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::PlacementApi - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/roles_data.yaml b/roles_data.yaml index 037083b46c..684802662d 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -166,7 +166,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::OsloMessagingNotify - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog @@ -252,7 +251,6 @@ - OS::TripleO::Services::NovaMigrationTarget - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar @@ -303,7 +301,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar @@ -356,7 +353,6 @@ - OS::TripleO::Services::MySQLClient - OS::TripleO::Services::ContainersLogrotateCrond - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 2ba0df00cb..856213cd01 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -77,7 +77,6 @@ - OS::TripleO::Services::OsloMessagingRpc - OS::TripleO::Services::PlacementApi - OS::TripleO::Services::Podman - - OS::TripleO::Services::Rear - OS::TripleO::Services::Redis - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index cc4811dac3..a86d36d920 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -123,8 +123,6 @@ environments: OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None - # Rear - OS::TripleO::Services::Rear: OS::Heat::None # Redis OS::TripleO::Services::Redis: OS::Heat::None # Rsyslog