Allow to skip docker reconfiguration during stack update
When installing OpenShift by means of TripleO, after
the initial docker configuration, openshift-ansible
also adds several parameters there.
Then, if we want to remove a single node, then a stack
update is performed, which returns the configuration
to its original state. In other words, it removes all
parameters added by openshift-ansible, which breaks OpenShift.
This commit adds the ability to disable reconfiguration of
docker at the time of stack update for all roles associated
with OpenShift.
Closes-Bug: #1804790
Conflicts:
puppet/services/docker.yaml
Depends-On: I0bcaeea9cd24ab35a81d8c3d6fc3a384c1e4c3c2
Change-Id: If202be5d27d81672e39cbe21867459d277220e23
(cherry picked from commit 0101b46387
)
This commit is contained in:
parent
307eada0cb
commit
bcad833984
|
@ -68,6 +68,27 @@ parameters:
|
|||
default: ''
|
||||
description: User added to the docker group in order to use container commands.
|
||||
type: string
|
||||
DockerSkipUpdateReconfiguration:
|
||||
default: false
|
||||
type: boolean
|
||||
description: Flag to disable docker reconfiguration during stack update.
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
# Merging role-specific parameters (RoleParameters) with the default parameters.
|
||||
# RoleParameters will have the precedence over the default parameters.
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- DockerSkipUpdateReconfiguration: DockerSkipUpdateReconfiguration
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
DockerSkipUpdateReconfiguration: {get_param: DockerSkipUpdateReconfiguration}
|
||||
|
||||
conditions:
|
||||
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
|
||||
|
@ -100,6 +121,7 @@ outputs:
|
|||
- {get_param: DockerInsecureRegistryAddress}
|
||||
container_registry_mirror: {get_param: DockerRegistryMirror}
|
||||
container_registry_network_options: {get_param: DockerNetworkOptions}
|
||||
container_registry_skip_reconfiguration: {get_attr: [RoleParametersValue, value, DockerSkipUpdateReconfiguration]}
|
||||
- include_role:
|
||||
name: container-registry
|
||||
tasks_from: docker
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
CountDefault: 1
|
||||
RoleParametersDefault:
|
||||
OpenShiftNodeGroupName: 'node-config-all-in-one'
|
||||
DockerSkipUpdateReconfiguration: true
|
||||
tags:
|
||||
- primary
|
||||
- controller
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
CountDefault: 1
|
||||
RoleParametersDefault:
|
||||
OpenShiftNodeGroupName: 'node-config-infra'
|
||||
DockerSkipUpdateReconfiguration: true
|
||||
tags:
|
||||
- openshift
|
||||
networks:
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
CountDefault: 1
|
||||
RoleParametersDefault:
|
||||
OpenShiftNodeGroupName: 'node-config-master'
|
||||
DockerSkipUpdateReconfiguration: true
|
||||
tags:
|
||||
- primary
|
||||
- controller
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
CountDefault: 1
|
||||
RoleParametersDefault:
|
||||
OpenShiftNodeGroupName: 'node-config-compute'
|
||||
DockerSkipUpdateReconfiguration: true
|
||||
tags:
|
||||
- openshift
|
||||
networks:
|
||||
|
|
Loading…
Reference in New Issue