Merge "[ironic] expose default boot_option in configuration and change it to local"

diff --cc puppet/services/ironic-conductor.yaml
index 666967b,8f2c060..83e2b85
--- 1/puppet/services/ironic-conductor.yaml
--- 2/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@@ -95,8 -98,8 +102,9 @@@ outputs
              ironic::conductor::cleaning_disk_erase: {get_param: IronicCleaningDiskErase}
              ironic::conductor::cleaning_network: {get_param: IronicCleaningNetwork}
              ironic::conductor::provisioning_network: {get_param: IronicProvisioningNetwork}
+             ironic::conductor::default_boot_option: {get_param: IronicDefaultBootOption}
              ironic::conductor::enabled_drivers: {get_param: IronicEnabledDrivers}
 +            ironic::conductor::enabled_hardware_types: {get_param: IronicEnabledHardwareTypes}
              # We need an endpoint containing a real IP, not a VIP here
              ironic_conductor_http_host: {get_param: [ServiceNetMap, IronicNetwork]}
              ironic::conductor::http_url: