commit ba5638660aa78f957759f725beb24b63732d5977
Merge: 4a8acbd 31831cf
Author: Zuul <zuul@review.opendev.org>
Date:   Fri Oct 2 19:56:52 2020 +0000

    Merge "Also configure Ironic for UC minions"

diff --cc sample-env-generator/undercloud-minion.yaml
index fe83caf,e4ecc31..450f029
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@@@ -23,9 -23,28 +23,30 @@@ environments
        puppet/controller-role.yaml:
          parameters:
            - SoftwareConfigTransport
 +      overcloud.yaml:
 +        parameters:
            - DnsServers
+       deployment/ironic/ironic-conductor-container-puppet.yaml:
+         parameters:
+           - IronicCleaningDiskErase
+           - IronicCleaningNetwork
+           - IronicDefaultInspectInterface
+           - IronicEnabledBootInterfaces
+           - IronicEnabledConsoleInterfaces
+           - IronicEnabledDeployInterfaces
+           - IronicEnabledHardwareTypes
+           - IronicEnabledInspectInterfaces
+           - IronicEnabledManagementInterfaces
+           - IronicEnabledNetworkInterfaces
+           - IronicEnabledPowerInterfaces
+           - IronicEnabledRaidInterfaces
+           - IronicEnabledRescueInterfaces
+           - IronicEnabledStorageInterfaces
+           - IronicEnabledVendorInterfaces
+           - IronicEnableStagingDrivers
+           - IronicForcePowerStateDuringSync
+           - IronicProvisioningNetwork
+           - IronicRescuingNetwork
      sample_values:
        # Normal bits for standalone
        StackAction: CREATE