Merge "Allow to skip docker reconfiguration during stack update"

puppet/services/docker.yaml

@@ -68,6 +68,12 @@ 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
 parameter_groups:
 - label: deprecated
   description: |
@@ -78,6 +84,21 @@ parameter_groups:
   parameters:
   - DockerAdditionalSockets
 
+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}, []]}
   service_debug_unset: {equals : [{get_param: DockerDebug}, '']}
@@ -109,6 +130,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

roles/OpenShiftAllInOne.yaml

@@ -7,6 +7,7 @@
   CountDefault: 1
   RoleParametersDefault:
     OpenShiftNodeGroupName: 'node-config-all-in-one'
+    DockerSkipUpdateReconfiguration: true
   tags:
     - primary
     - controller

roles/OpenShiftInfra.yaml

@@ -7,6 +7,7 @@
   CountDefault: 1
   RoleParametersDefault:
     OpenShiftNodeGroupName: 'node-config-infra'
+    DockerSkipUpdateReconfiguration: true
   tags:
     - openshift
   networks:

roles/OpenShiftMaster.yaml

@@ -7,6 +7,7 @@
   CountDefault: 1
   RoleParametersDefault:
     OpenShiftNodeGroupName: 'node-config-master'
+    DockerSkipUpdateReconfiguration: true
   tags:
     - primary
     - controller

roles/OpenShiftWorker.yaml

@@ -7,6 +7,7 @@
   CountDefault: 1
   RoleParametersDefault:
     OpenShiftNodeGroupName: 'node-config-compute'
+    DockerSkipUpdateReconfiguration: true
   tags:
     - openshift
   networks: