From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 27 Apr 2017 16:01:43 +0000 (+0000)
Subject: Merge "[ironic] expose default boot_option in configuration and change it to local"
X-Git-Tag: opnfv-6.0.0~725
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=09de6b033035a29259480771d12964b7ff175da1;p=apex-tripleo-heat-templates.git

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

09de6b033035a29259480771d12964b7ff175da1
diff --cc puppet/services/ironic-conductor.yaml
index 666967b9,8f2c0602..83e2b850
--- a/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: