Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393841 )
Change subject: nova-network dnsmasq: set a deployment-appropriate cname for
'puppet'
......................................................................
nova-network dnsmasq: set a deployment-appropriate cname for 'puppet'
This should allow us to avoid a bit of firstboot magic when setting up
puppet on new instances.
Bug: T181375
Change-Id: I9f72006c59241456e96d38d9a1d94542d42302d1
---
M modules/openstack/manifests/nova/network/service.pp
M modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
M modules/profile/manifests/openstack/base/nova/network/service.pp
M modules/profile/manifests/openstack/labtest/nova/network/service.pp
4 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/393841/1
diff --git a/modules/openstack/manifests/nova/network/service.pp
b/modules/openstack/manifests/nova/network/service.pp
index d9eee9c..d1f56a1 100644
--- a/modules/openstack/manifests/nova/network/service.pp
+++ b/modules/openstack/manifests/nova/network/service.pp
@@ -9,6 +9,7 @@
$tftp_host='install1002.wikimedia.org',
$labs_metal={},
$nova_dnsmasq_aliases={},
+ $puppetmaster_hostname = "",
) {
$recursor_ip = ipresolve($dns_recursor,4)
diff --git
a/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
b/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
index 1ba03a2..d6e7d3f 100644
--- a/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb
@@ -13,6 +13,9 @@
dhcp-host=<%= v['MAC'] %>,<%= k %>,<%= v['IPv4'] %>,10m
<% end -%>
+# define 'puppet' so that our intial puppet run knows where to look
+cname=puppet,<%= @puppetmaster_hostname -%>
+
#Clients should use the designate-backed dns server rather than dnsmasq
dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
diff --git a/modules/profile/manifests/openstack/base/nova/network/service.pp
b/modules/profile/manifests/openstack/base/nova/network/service.pp
index 355f1d0..49deba6 100644
--- a/modules/profile/manifests/openstack/base/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/network/service.pp
@@ -9,6 +9,7 @@
$network_flat_tagged_base_interface =
hiera('profile::openstack::base::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::base::nova::network_flat_interface_vlan'),
$network_public_ip =
hiera('profile::openstack::base::nova::network_public_ip'),
+ $puppetmaster_hostname =
hiera('profile::openstack::base::puppetmaster_hostname'),
) {
if ($::fqdn == $nova_network_host) {
@@ -33,5 +34,6 @@
nova_dnsmasq_aliases => $nova_dnsmasq_aliases,
dns_recursor => $dns_recursor,
dns_recursor_secondary => $dns_recursor_secondary,
+ puppetmaster_hostname => $puppetmaster_hostname,
}
}
diff --git
a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
index 07d051d..d5f7139 100644
--- a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
@@ -7,6 +7,7 @@
$network_flat_tagged_base_interface =
hiera('profile::openstack::labtest::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::labtest::nova::network_flat_interface_vlan'),
$network_public_ip =
hiera('profile::openstack::labtest::nova::network_public_ip'),
+ $puppetmaster_hostname =
hiera('profile::openstack::labtest::puppetmaster_hostname'),
) {
require ::profile::openstack::labtest::nova::common
@@ -19,6 +20,7 @@
network_flat_tagged_base_interface =>
$network_flat_tagged_base_interface,
network_flat_interface_vlan => $network_flat_interface_vlan,
network_public_ip => $network_public_ip,
+ puppetmaster_hostname => $puppetmaster_hostname,
}
class {'::openstack::nova::network::monitor':
--
To view, visit https://gerrit.wikimedia.org/r/393841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f72006c59241456e96d38d9a1d94542d42302d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
