openstack/instack-undercloud
Code Issues Proposed changes

Merge "Re-enable pxe_drac driver"

Browse Source
This commit is contained in:
James Slagle 2015-03-27 01:24:02 +01:00 committed by Gerrit Code Review
commit a9c10413c5
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -304,7 +304,7 @@ class { 'nova::network::neutron':
include ::ironic::conductor
class { 'ironic':
enabled_drivers => ['pxe_ipmitool', 'pxe_ssh']
enabled_drivers => ['pxe_ipmitool', 'pxe_ssh', 'pxe_drac']
}
class { 'ironic::api':

12
elements/undercloud-stack-config/config.json.template
View File

@ -5,18 +5,6 @@
]},
"local-ip": "{{LOCAL_IP}}",
"masquerade_networks": ["{{MASQUERADE_NETWORK}}"],
"ironic": {
"config" : [
{
"section": "DEFAULT",
"values": [
{ "option": "enabled_drivers",
"value": "pxe_ssh,pxe_ipmitool,pxe_drac"
}
]
}
]
},
"neutron": {
"dhcp_start": "{{DHCP_START}}",
"dhcp_end": "{{DHCP_END}}",