Merge "Only erase disk metadata if automated cleaning is enabled"

This commit is contained in:
Jenkins
2016-11-28 21:47:22 +00:00
committed by Gerrit Code Review

View File

@@ -390,6 +390,7 @@ ironic::rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
ironic::conductor::api_url: {{UNDERCLOUD_ENDPOINT_IRONIC_INTERNAL}}
ironic::conductor::force_power_state_during_sync: false
ironic::conductor::automated_clean: {{CLEAN_NODES}}
ironic::conductor::cleaning_disk_erase: 'metadata'
ironic::conductor::default_boot_option: 'local'
ironic::keystone::auth::tenant: 'service'
ironic::keystone::auth::public_url: {{UNDERCLOUD_ENDPOINT_IRONIC_PUBLIC}}