BBlack has submitted this change and it was merged.
Change subject: Add public->private mappings for labs to dnsmasq aliases
......................................................................
Add public->private mappings for labs to dnsmasq aliases
This should let labs instances connect to public hostnames
which map to these public IPs, by translating the address
to the private variant in the DNS responses.
In the future, it would be nice to pull this directly
from OpenStack somewhere/somehow.
Change-Id: I685b5cab204e8e319d0663d11fb9872bb81d7b6e
---
D files/openstack/folsom/nova/dnsmasq-nova.conf
D files/openstack/havana/nova/dnsmasq-nova.conf
M manifests/openstack.pp
A templates/openstack/folsom/nova/dnsmasq-nova.conf.erb
A templates/openstack/havana/nova/dnsmasq-nova.conf.erb
5 files changed, 31 insertions(+), 5 deletions(-)
Approvals:
BBlack: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/openstack/folsom/nova/dnsmasq-nova.conf
b/files/openstack/folsom/nova/dnsmasq-nova.conf
deleted file mode 100644
index 5817e4b..0000000
--- a/files/openstack/folsom/nova/dnsmasq-nova.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#default is 150, not enough.
-cache-size=1200
diff --git a/files/openstack/havana/nova/dnsmasq-nova.conf
b/files/openstack/havana/nova/dnsmasq-nova.conf
deleted file mode 100644
index 5817e4b..0000000
--- a/files/openstack/havana/nova/dnsmasq-nova.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#default is 150, not enough.
-cache-size=1200
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 922f719..e8b9829 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -732,8 +732,26 @@
require => Package["dnsmasq"];
}
+ $nova_dnsmasq_aliases = {
+ # eqiad
+ 'deployment-cache-text02' => {public_ip => '208.80.155.135',
+ private_ip => '10.68.16.16' },
+ 'deployment-cache-upload02' => {public_ip => '208.80.155.136',
+ private_ip => '10.68.17.51' },
+ 'deployment-cache-bits01' => {public_ip => '208.80.155.137',
+ private_ip => '10.68.16.12' },
+ 'deployment-eventlogging02' => {public_ip => '208.80.155.138',
+ private_ip => '10.68.16.52' },
+ 'deployment-cache-mobile03' => {public_ip => '208.80.155.139',
+ private_ip => '10.68.16.13' },
+
+ # A wide variety of hosts are reachable via a public web proxy.
+ 'labs_shared_proxy' => {public_ip => '208.80.155.156',
+ private_ip => '10.68.16.65'},
+ }
+
file { '/etc/dnsmasq-nova.conf':
- source =>
"puppet:///files/openstack/${openstack_version}/nova/dnsmasq-nova.conf",
+ content =>
template("openstack/${$openstack_version}/nova/dnsmasq-nova.conf.erb"),
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/templates/openstack/folsom/nova/dnsmasq-nova.conf.erb
b/templates/openstack/folsom/nova/dnsmasq-nova.conf.erb
new file mode 100644
index 0000000..2f28814
--- /dev/null
+++ b/templates/openstack/folsom/nova/dnsmasq-nova.conf.erb
@@ -0,0 +1,6 @@
+#default is 150, not enough.
+cache-size=1200
+<% @nova_dnsmasq_aliases.each do |k,v| -%>
+# <%= k %>
+alias=<%= v['public_ip'] %>,<%= v['private_ip'] %>
+<% end -%>
diff --git a/templates/openstack/havana/nova/dnsmasq-nova.conf.erb
b/templates/openstack/havana/nova/dnsmasq-nova.conf.erb
new file mode 100644
index 0000000..2f28814
--- /dev/null
+++ b/templates/openstack/havana/nova/dnsmasq-nova.conf.erb
@@ -0,0 +1,6 @@
+#default is 150, not enough.
+cache-size=1200
+<% @nova_dnsmasq_aliases.each do |k,v| -%>
+# <%= k %>
+alias=<%= v['public_ip'] %>,<%= v['private_ip'] %>
+<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/138017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I685b5cab204e8e319d0663d11fb9872bb81d7b6e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
