diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index fd98dbcdb6..f3f01dc07f 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -36,6 +36,7 @@ parameter_defaults: # NOTE(dtantsur): we don't use boot-from-cinder on the undercloud IronicEnabledStorageInterfaces: ['noop'] IronicEnabledVendorInterfaces: ['ipmitool', 'idrac', 'no-vendor'] + IronicEnableStagingDrivers: true IronicInspectorCollectors: default,extra-hardware,numa-topology,logs IronicInspectorInterface: br-ctlplane IronicInspectorIpRange: '192.168.24.100,192.168.24.200' diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 3e0a133748..0de38f259c 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -118,6 +118,10 @@ parameters: description: Enabled vendor interface implementations. Each hardware type must have at least one valid implementation enabled. type: comma_delimited_list + IronicEnableStagingDrivers: + default: false + description: Whether to enable use of staging drivers. + type: boolean IronicIPXEEnabled: default: true description: Whether to use iPXE instead of PXE for deployment. @@ -254,6 +258,7 @@ outputs: ironic::drivers::inspector::project_name: 'service' ironic::drivers::inspector::user_domain_name: 'Default' ironic::drivers::inspector::project_domain_name: 'Default' + tripleo::profile::base::ironic::conductor::enable_staging: {get_param: IronicEnableStagingDrivers} step_config: | include ::tripleo::profile::base::ironic::conductor upgrade_tasks: