Merge "Add support for Ironic Conductor Groups"

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -219,6 +219,12 @@ parameters:
     default: true
     description: Whether to force power state during sync.
     type: boolean
+  IronicConductorGroup:
+    description: The name of an Ironic Conductor Group.
+    default: ''
+    type: string
+    constraints:
+      - allowed_pattern: '^[a-zA-Z0-9_\-\.]*$'
   MonitoringSubscriptionIronicConductor:
     default: 'overcloud-ironic-conductor'
     type: string
@@ -238,6 +244,7 @@ conditions:
       - equals: [{get_param: Debug}, true]
   enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]}
   configure_swift_temp_url: {equals: [{get_param: IronicConfigureSwiftTempUrlKey}, true]}
+  ironic_conductor_group: {not: {equals: [{get_param: IronicConductorGroup}, '']}}
 
 resources:
 
@@ -421,6 +428,11 @@ outputs:
           - ironic::pxe::tftp_root: /var/lib/ironic/tftpboot
           - ironic::pxe::http_root: /var/lib/ironic/httpboot
           - ironic::conductor::http_root: /var/lib/ironic/httpboot
+          -
+            if:
+            - ironic_conductor_group
+            - ironic::conductor::conductor_group: {get_param: IronicConductorGroup}
+            - {}
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config:

releasenotes/notes/ironic-conductor-groups-577543f8ca612f06.yaml

@@ -0,0 +1,13 @@
+---
+features:
+  - |
+    `IronicConductorGroup` allows to define an Ironic Conductor Group so
+    that the managed baremetal nodes may be later manually distributed by
+    operators across multiple conductors. By default,
+    `IronicConductorGroup` takes an empty value, which creates no
+    conductor groups associated with the given Ironic Conductor service
+    instance.
+
+    .. note:: There is the default Ironic conductor group named "''", but
+      it cannot be re-defined with `IronicConductorGroup` because of the
+      empty value has been reserved for another purposes in t-h-t.