Browse Source

Merge "Adding ReaR THT"

tags/12.0.0
Zuul 2 weeks ago
parent
commit
81e8bb1944
33 changed files with 140 additions and 0 deletions
  1. +98
    -0
      deployment/backup-and-restore/rear-baremetal-ansible.yaml
  2. +3
    -0
      environments/backup-and-restore/rear.yaml
  3. +1
    -0
      environments/hyperconverged-ceph.yaml
  4. +1
    -0
      environments/standalone/standalone-tripleo.yaml
  5. +1
    -0
      environments/undercloud.yaml
  6. +1
    -0
      overcloud-resource-registry-puppet.j2.yaml
  7. +5
    -0
      releasenotes/notes/adding-rear-service-5fac71fa6fbd9c9e.yaml
  8. +1
    -0
      roles/BlockStorage.yaml
  9. +1
    -0
      roles/Compute.yaml
  10. +1
    -0
      roles/ComputeHCI.yaml
  11. +1
    -0
      roles/ComputeHCIOvsDpdk.yaml
  12. +1
    -0
      roles/ComputeLocalEphemeral.yaml
  13. +1
    -0
      roles/ComputeOvsDpdk.yaml
  14. +1
    -0
      roles/ComputeOvsDpdkRT.yaml
  15. +1
    -0
      roles/ComputePPC64LE.yaml
  16. +1
    -0
      roles/ComputeRBDEphemeral.yaml
  17. +1
    -0
      roles/ComputeRealTime.yaml
  18. +1
    -0
      roles/ComputeSriov.yaml
  19. +1
    -0
      roles/ComputeSriovRT.yaml
  20. +1
    -0
      roles/Controller.yaml
  21. +1
    -0
      roles/ControllerNoCeph.yaml
  22. +1
    -0
      roles/ControllerOpenstack.yaml
  23. +1
    -0
      roles/HciCephAll.yaml
  24. +1
    -0
      roles/HciCephFile.yaml
  25. +1
    -0
      roles/HciCephMon.yaml
  26. +1
    -0
      roles/HciCephObject.yaml
  27. +1
    -0
      roles/ObjectStorage.yaml
  28. +1
    -0
      roles/Standalone.yaml
  29. +1
    -0
      roles/Undercloud.yaml
  30. +1
    -0
      roles/UndercloudMinion.yaml
  31. +4
    -0
      roles_data.yaml
  32. +1
    -0
      roles_data_undercloud.yaml
  33. +2
    -0
      sample-env-generator/standalone.yaml

+ 98
- 0
deployment/backup-and-restore/rear-baremetal-ansible.yaml View File

@@ -0,0 +1,98 @@
heat_template_version: rocky

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. This
mapping overrides those in ServiceNetMapDefaults.
type: json
DefaultPasswords:
default: {}
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
BackupAndRestoreNFSStorageFolder:
default: '/ctl_plane_backups'
description: NFS storage folder
type: string
tags:
- role_specific
BackupAndRestoreExcludePathsCommon:
default: ['/data/*', '/tmp/*', {get_param: BackupAndRestoreStorageFolder}]
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: {get_param: BackupAndRestoreExcludePathsCommon}
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}


+ 3
- 0
environments/backup-and-restore/rear.yaml View File

@@ -0,0 +1,3 @@
# 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

+ 1
- 0
environments/hyperconverged-ceph.yaml View File

@@ -60,5 +60,6 @@ parameter_defaults:
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::LoginDefs
- OS::TripleO::Services::Rear
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Podman

+ 1
- 0
environments/standalone/standalone-tripleo.yaml View File

@@ -106,6 +106,7 @@ resource_registry:
OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-container-puppet.yaml
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.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::SaharaApi: OS::Heat::None

+ 1
- 0
environments/undercloud.yaml View File

@@ -34,6 +34,7 @@ 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

+ 1
- 0
overcloud-resource-registry-puppet.j2.yaml View File

@@ -174,6 +174,7 @@ resource_registry:
OS::TripleO::Services::OsloMessagingRpc: deployment/rabbitmq/rabbitmq-messaging-rpc-container-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-container-puppet.yaml
OS::TripleO::Services::HAProxyPublicTLS: deployment/haproxy/haproxy-public-tls-inject.yaml

+ 5
- 0
releasenotes/notes/adding-rear-service-5fac71fa6fbd9c9e.yaml View File

@@ -0,0 +1,5 @@
---
features:
- |
Inclusion and configuration of ReaR service to undercloud
and overcloud nodes.

+ 1
- 0
roles/BlockStorage.yaml View File

@@ -34,6 +34,7 @@
- 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

+ 1
- 0
roles/Compute.yaml View File

@@ -64,6 +64,7 @@
- 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

+ 1
- 0
roles/ComputeHCI.yaml View File

@@ -51,6 +51,7 @@
- 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

+ 1
- 0
roles/ComputeHCIOvsDpdk.yaml View File

@@ -52,6 +52,7 @@
- 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

+ 1
- 0
roles/ComputeLocalEphemeral.yaml View File

@@ -53,6 +53,7 @@
- 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

+ 1
- 0
roles/ComputeOvsDpdk.yaml View File

@@ -52,6 +52,7 @@
- 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::RsyslogSidecar

+ 1
- 0
roles/ComputeOvsDpdkRT.yaml View File

@@ -53,6 +53,7 @@
- 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::RsyslogSidecar

+ 1
- 0
roles/ComputePPC64LE.yaml View File

@@ -50,6 +50,7 @@
- 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

+ 1
- 0
roles/ComputeRBDEphemeral.yaml View File

@@ -53,6 +53,7 @@
- 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

+ 1
- 0
roles/ComputeRealTime.yaml View File

@@ -57,6 +57,7 @@
- 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

+ 1
- 0
roles/ComputeSriov.yaml View File

@@ -49,6 +49,7 @@
- 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

+ 1
- 0
roles/ComputeSriovRT.yaml View File

@@ -51,6 +51,7 @@
- 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

+ 1
- 0
roles/Controller.yaml View File

@@ -159,6 +159,7 @@
- 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

+ 1
- 0
roles/ControllerNoCeph.yaml View File

@@ -151,6 +151,7 @@
- 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

+ 1
- 0
roles/ControllerOpenstack.yaml View File

@@ -120,6 +120,7 @@
- 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

+ 1
- 0
roles/HciCephAll.yaml View File

@@ -58,6 +58,7 @@
- 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

+ 1
- 0
roles/HciCephFile.yaml View File

@@ -53,6 +53,7 @@
- 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

+ 1
- 0
roles/HciCephMon.yaml View File

@@ -54,6 +54,7 @@
- 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

+ 1
- 0
roles/HciCephObject.yaml View File

@@ -53,6 +53,7 @@
- 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

+ 1
- 0
roles/ObjectStorage.yaml View File

@@ -38,6 +38,7 @@
- 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

+ 1
- 0
roles/Standalone.yaml View File

@@ -158,6 +158,7 @@
- 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

+ 1
- 0
roles/Undercloud.yaml View File

@@ -77,6 +77,7 @@
- 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

+ 1
- 0
roles/UndercloudMinion.yaml View File

@@ -20,6 +20,7 @@
- OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::OpenStackClients
- OS::TripleO::Services::Podman
- OS::TripleO::Services::Rear
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Timesync

+ 4
- 0
roles_data.yaml View File

@@ -162,6 +162,7 @@
- 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,6 +251,7 @@
- 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
@@ -301,6 +303,7 @@
- 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
@@ -352,6 +355,7 @@
- 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

+ 1
- 0
roles_data_undercloud.yaml View File

@@ -80,6 +80,7 @@
- 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

+ 2
- 0
sample-env-generator/standalone.yaml View File

@@ -130,6 +130,8 @@ environments:
OS::TripleO::Services::MistralEngine: OS::Heat::None
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
# Rear
OS::TripleO::Services::Rear: OS::Heat::None
# Redis
OS::TripleO::Services::Redis: OS::Heat::None
# Rsyslog

Loading…
Cancel
Save