openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disabling container validation when running redhat-subscription"

This commit is contained in:
Zuul 2022-04-15 14:29:38 +00:00 committed by Gerrit Code Review
parent 433b6dcb18 53d3af77f7
commit fa25969f17
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deployment/rhsm/rhsm-baremetal-ansible.yaml
View File

@ -47,12 +47,12 @@ resources:
properties: properties:
type: json type: json
value: value:
map_replace: map_merge:
- map_replace: - rhsm_disable_container_check: true
- vars: RhsmVars - if:
- values: {get_param: [RoleParameters]} - not: {equals: [{get_param: [RoleParameters, RhsmVars]}, '']}
- values: - {get_param: [RoleParameters, RhsmVars]}
RhsmVars: {get_param: RhsmVars} - {get_param: RhsmVars}
outputs: outputs:
role_data: role_data:
@ -63,7 +63,7 @@ outputs:
- name: Red Hat Subscription Management configuration during deployment - name: Red Hat Subscription Management configuration during deployment
import_role: import_role:
name: redhat-subscription name: redhat-subscription
vars: {get_attr: [RoleParametersValue, value, vars]} vars: {get_attr: [RoleParametersValue, value]}
scale_tasks: scale_tasks:
- name: Red Hat Subscription Management configuration during scale-down - name: Red Hat Subscription Management configuration during scale-down
tags: down tags: down
@ -71,13 +71,14 @@ outputs:
import_role: import_role:
name: redhat-subscription name: redhat-subscription
tasks_from: unregister tasks_from: unregister
vars: {get_attr: [RoleParametersValue, value]}
upgrade_tasks: upgrade_tasks:
- name: Red Hat Subscription Management configuration - name: Red Hat Subscription Management configuration
import_role: import_role:
name: redhat-subscription name: redhat-subscription
vars: vars:
map_merge: map_merge:
- {get_attr: [RoleParametersValue, value, vars]} - {get_attr: [RoleParametersValue, value]}
# Force only rhsm_repos content to be enabled. # Force only rhsm_repos content to be enabled.
- rhsm_repos_purge: True - rhsm_repos_purge: True
- rhsm_force_register: True - rhsm_force_register: True