Add a new role parameter rhsm_enforce.
With this new switch we can opt-out enforcement of the subscription
check for some composed role. This is mainly useful for composed Ceph
which have different constraint than other Openstack roles.
Closes-Bug: 1912512
Depends-On: https://review.opendev.org/c/openstack/tripleo-ansible/+/773912
Change-Id: I46529ccab6c197da4885950282eb6731e28573d6
(cherry picked from commit f87652dfe0
)
This commit is contained in:
parent
28a2635940
commit
d49fe9c60c
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -391,6 +391,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
|
||||||
|
Loading…
Reference in New Issue
Block a user