Update rhsm_disable_container_check default value

Following [1], the right way to disable the feature is to set the env
var value to an empty string.
Until now, whatever the value was (even False), it was enabled, because
the var was in the env.

[1] https://github.com/candlepin/subscription-manager/pull/3097

Change-Id: I54e1452dc4bb6e2e25fa9567335b62b730000e83
This commit is contained in:
Cédric Jeanneret 2022-08-11 13:14:55 +02:00
parent f703e5c494
commit eefe501923
5 changed files with 6 additions and 6 deletions

View File

@ -22,7 +22,7 @@
server_proxy_password: "{{ rhsm_rhsm_proxy_password | default(omit) }}"
register: subscrition_result
environment:
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check | bool }}"
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check }}"
tags:
- rhsm
- rhsm_register
@ -31,7 +31,7 @@
- name: Clean all local subscription data
command: subscription-manager clean
environment:
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check | bool }}"
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check }}"
- import_tasks: register.yml

View File

@ -17,7 +17,7 @@
server_proxy_password: "{{ rhsm_rhsm_proxy_password | default(omit) }}"
register: subscrition_result
environment:
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check | bool }}"
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check }}"
tags:
- rhsm
- rhsm_register

View File

@ -41,5 +41,5 @@
- name: SATELLITE 6 | Execute katello-rhsm-consumer
shell: katello-rhsm-consumer
environment:
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check | bool }}"
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check }}"
when: katello_rpm.changed

View File

@ -1,7 +1,7 @@
- name: Unregister Red Hat subscription
command: subscription-manager remove --all
environment:
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check | bool }}"
SMDEV_CONTAINER_OFF: "{{ rhsm_disable_container_check }}"
become: true
tags:
- rhsm_unregister

View File

@ -1,6 +1,6 @@
rhsm_repo_ca_cert: "{{ '%(ca_cert_dir)s' ~ ('katello-server-ca.pem' if rhsm_method == 'satellite' else 'redhat-uep.pem') }}"
rhsm_full_refresh_on_yum: "{{ 1 if rhsm_method == 'satellite' else 0 }}"
rhsm_disable_container_check: false
rhsm_disable_container_check: ''
rhsm_yum_plugins:
- file: product-id.conf
option: enabled