Andrew Bogott has submitted this change and it was merged.
Change subject: nova-network: have dnsmasq advertise pxe-boot options
......................................................................
nova-network: have dnsmasq advertise pxe-boot options
Change-Id: I3f8304edbe2714a8e7bf6831b85464e94a6652c0
---
M modules/openstack/manifests/nova/network.pp
M modules/openstack/templates/kilo/nova/dnsmasq-nova.conf.erb
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 3614f35..663be99 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -4,6 +4,8 @@
class openstack::nova::network($openstack_version=$::openstack::version,
$novaconfig) {
include openstack::repo
+ $tftp_host = hiera('carbon.wikimedia.org')
+
package { [ 'nova-network', 'dnsmasq' ]:
ensure => present,
require => Class['openstack::repo'];
diff --git a/modules/openstack/templates/kilo/nova/dnsmasq-nova.conf.erb
b/modules/openstack/templates/kilo/nova/dnsmasq-nova.conf.erb
index 475f650..82f181f 100644
--- a/modules/openstack/templates/kilo/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/kilo/nova/dnsmasq-nova.conf.erb
@@ -15,3 +15,9 @@
#Clients should use the designate-backed dns server rather than dnsmasq
dhcp-option=option:dns-server,<%= @recursor_ip %>
+
+dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%=
scope.function_ipresolve([@tftp_host, 4]) %>
+
+# This next line is a bit of a hack, supporting only a single
+# serial port/baud speed for labs metal
+dhcp-option-force=209,pxelinux.cfg/ttyS1-115200
--
To view, visit https://gerrit.wikimedia.org/r/259788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f8304edbe2714a8e7bf6831b85464e94a6652c0
Gerrit-PatchSet: 15
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
