diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-05 15:15:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-05 15:15:38 +0000 |
| commit | ad74fb1336e7bc198efae3eef86a28c4339961d6 (patch) | |
| tree | 9f226cc3eaecfd218358beee20c79438a5a9033b /puppet/services | |
| parent | 96019c7489f60ac9b0b27cb2cb1dda888a2123b7 (diff) | |
| parent | e2d5bbc41e3e7ab4952dab55094c88933d4b7143 (diff) | |
Merge "Ironic: configure disk erasing during cleaning"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/ironic-conductor.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index e9b4da6f..4b71ead0 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -18,6 +18,12 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + IronicCleaningDiskErase: + default: 'full' + description: Type of disk cleaning before and between deployments, + "full" for full cleaning, "metadata" to clean only disk + metadata (partition table). + type: string IronicEnabledDrivers: default: ['pxe_ipmitool', 'agent_ipmitool'] description: Enabled Ironic drivers @@ -54,6 +60,7 @@ outputs: # FIXME: I have no idea why neutron_url is in "api" manifest - ironic::api::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]} ironic::conductor::api_url: {get_param: [EndpointMap, IronicInternal, uri_no_suffix]} + ironic::conductor::cleaning_disk_erase: {get_param: IronicCleaningDiskErase} ironic::conductor::enabled_drivers: {get_param: IronicEnabledDrivers} # We need an endpoint containing a real IP, not a VIP here ironic_conductor_http_host: {get_param: [ServiceNetMap, IronicNetwork]} |