Merge "Add a new role parameter rhsm_enforce." into stable/ussuri

This commit is contained in:
Zuul 2021-02-18 14:56:58 +00:00 committed by Gerrit Code Review
commit 2e63b215f1
6 changed files with 11 additions and 0 deletions

View File

@ -815,6 +815,7 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tripleo_minor_update: true
tripleo_redhat_enforce: {{role.rhsm_enforce|default("true")}}
tasks:
- import_tasks: hiera_steps_tasks.yaml
- import_tasks: common_container_config_scripts.yaml

View File

@ -12,6 +12,7 @@
HostnameFormatDefault: '%stackname%-ceph-file-%index%'
# CephOSD present so serial has to be 1
update_serial: 1
rhsm_enforce: False
ServicesDefault:
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD

View File

@ -12,6 +12,7 @@
HostnameFormatDefault: '%stackname%-ceph-object-%index%'
# CephOSD present so serial has to be 1
update_serial: 1
rhsm_enforce: False
ServicesDefault:
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD

View File

@ -13,6 +13,7 @@
deprecated_nic_config_name: 'ceph-storage.yaml'
# CephOSD present so serial has to be 1
update_serial: 1
rhsm_enforce: False
ServicesDefault:
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD

View File

@ -72,6 +72,12 @@ Role Options
configuration would be skipped for the role. The names should match
those defined in network_data.yaml
* rhsm_enforce: (boolean), optional, default to true. Some role may
not follow the EUS stream constraint, like CephOSD or composed Ceph
Mon/Mgr. This switch ensures that we can model this and disable the
check when it is not needed. Note that on non Red Hat environment
this switch has no effect.
Working with Roles
==================
The tripleoclient provides a series of commands that can be used to view

View File

@ -383,6 +383,7 @@
deprecated_nic_config_name: 'ceph-storage.yaml'
# CephOSD present so serial has to be 1
update_serial: 1
rhsm_enforce: False
ServicesDefault:
- OS::TripleO::Services::Aide
- OS::TripleO::Services::AuditD