Browse Source

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/+/775581


Change-Id: I46529ccab6c197da4885950282eb6731e28573d6
(cherry picked from commit d49fe9c60c)
changes/66/775766/2
Sofer Athlan-Guyot 5 months ago
parent
commit
cde398d9b4
6 changed files with 11 additions and 0 deletions
  1. +1
    -0
      common/deploy-steps.j2
  2. +1
    -0
      roles/CephFile.yaml
  3. +1
    -0
      roles/CephObject.yaml
  4. +1
    -0
      roles/CephStorage.yaml
  5. +6
    -0
      roles/README.rst
  6. +1
    -0
      roles_data.yaml

+ 1
- 0
common/deploy-steps.j2 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


+ 1
- 0
roles/CephFile.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


+ 1
- 0
roles/CephObject.yaml 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


+ 1
- 0
roles/CephStorage.yaml 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


+ 6
- 0
roles/README.rst 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


+ 1
- 0
roles_data.yaml 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


Loading…
Cancel
Save