Browse Source

Merge "Allow rhsm subscription test to be overrided in RHOSP deployment."

changes/34/771034/51
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
65eafe7cb6
  1. 2
      tripleo_ansible/roles/tripleo_redhat_enforce/defaults/main.yml
  2. 5
      tripleo_ansible/roles/tripleo_redhat_enforce/tasks/enforce_release.yml
  3. 4
      tripleo_ansible/roles/tripleo_redhat_enforce/tasks/main.yml
  4. 1
      tripleo_ansible/roles/tripleo_redhat_enforce/vars/redhat.yml

2
tripleo_ansible/roles/tripleo_redhat_enforce/defaults/main.yml

@ -19,6 +19,6 @@
# All variables within this role should have a prefix of "tripleo_redhat_enforce"
tripleo_redhat_enforce_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}"
tripleo_redhat_enforce: false
tripleo_redhat_enforce: true
tripleo_redhat_enforce_osp: ''
tripleo_redhat_enforce_os: ''

5
tripleo_ansible/roles/tripleo_redhat_enforce/tasks/enforce_release.yml

@ -18,7 +18,7 @@
https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html-single/
director_installation_and_usage/index#configuring-the-undercloud-with-environment-files,
for the Overcloud you need to add a new parameter file to your deploy
command with that parameter set.
command with that parameter set. You can also disable it in the role, see rhsm_enforce role parameter.
If this is unexpected, you have to subscribe this node and
ensure that RHEL is pinned to {{ tripleo_redhat_enforce_os }} as
this is the only version supported for {{ tripleo_redhat_enforce_osp }}.
@ -41,5 +41,6 @@
OSP{{ tripleo_redhat_enforce_osp }} is only supported with Red Hat {{ tripleo_redhat_enforce_os }}.
Please make sure to pin rhel to {{ tripleo_redhat_enforce_os }} using:
subscription-manager release --set={{ tripleo_redhat_enforce_os }}.
You can then proceed with the update.
You can then proceed with the update. You can also disable it in the
role, see rhsm_enforce role parameter, if this is expected.
when: tripleo_redhat_enforce_os not in subscribed_release.stdout

4
tripleo_ansible/roles/tripleo_redhat_enforce/tasks/main.yml

@ -33,4 +33,6 @@
- include_tasks: enforce_release.yml
name: Enforce RHEL/OSP version pair
when: tripleo_redhat_enforce|bool
when:
- (ansible_distribution | lower) == "redhat"
- tripleo_redhat_enforce|bool

1
tripleo_ansible/roles/tripleo_redhat_enforce/vars/redhat.yml

@ -18,6 +18,5 @@
# All variables intended for modification should be placed in this file.
# All variables within this role should have a prefix of "tripleo_redhat_enforce"
tripleo_redhat_enforce: true
tripleo_redhat_enforce_osp: ''
tripleo_redhat_enforce_os: ''

Loading…
Cancel
Save