openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add a new role parameter rhsm_enforce."

Browse Source
This commit is contained in:
Zuul 2021-02-03 16:23:27 +00:00 committed by Gerrit Code Review
commit 525d2278c3
6 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/deploy-steps.j2
View File

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

1
roles/CephFile.yaml
View File

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

1
roles/CephObject.yaml
View File

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

1
roles/CephStorage.yaml
View File

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

6
roles/README.rst
View File

@ -72,6 +72,12 @@ Role Options
configuration would be skipped for the role. The names should match configuration would be skipped for the role. The names should match
those defined in network_data.yaml 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 Working with Roles
================== ==================
The tripleoclient provides a series of commands that can be used to view The tripleoclient provides a series of commands that can be used to view

1
roles_data.yaml
View File

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