Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204412
Change subject: Just hardcode the designate ip.
......................................................................
Just hardcode the designate ip.
I can't get scope.function_ipresolve to work the way I'd expect.
Change-Id: Ief6add47aecf73872edc95ddcc81977e8cf3b873
---
M manifests/role/nova.pp
M manifests/role/puppet.pp
M manifests/role/salt.pp
M modules/puppetmaster/templates/puppet_cert_manager.pub.erb
4 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/204412/1
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 8fdd31f..d2de035 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -59,11 +59,11 @@
default => $nova_controller_hostname,
}
}
- $designate_hostname = $::realm ? {
- 'production' => 'holmium.wikimedia.org',
+ $designate_ip = $::realm ? {
+ 'production' => '208.80.154.12',
'labs' => $nova_controller_hostname ? {
undef => $::ipaddress_eth0,
- default => $nova_controller_hostname,
+ default => $nova_controller_ip,
}
}
$controller_address = $::realm ? {
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index 6826795..199418f 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -37,7 +37,7 @@
if ! defined(Class['puppetmaster::certmanager']) {
class { 'puppetmaster::certmanager':
- remote_cert_cleaner => $novaconfig['designate_hostname'],
+ remote_cert_cleaner => $novaconfig['designate_ip'],
}
}
}
diff --git a/manifests/role/salt.pp b/manifests/role/salt.pp
index 2824bb6..0227649 100644
--- a/manifests/role/salt.pp
+++ b/manifests/role/salt.pp
@@ -49,7 +49,7 @@
if ! defined(Class['puppetmaster::certmanager']) {
class { 'puppetmaster::certmanager':
- remote_cert_cleaner => $novaconfig['designate_hostname'],
+ remote_cert_cleaner => $novaconfig['designate_ip'],
}
}
}
diff --git a/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
b/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
index fcab503..e8243ea 100644
--- a/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
+++ b/modules/puppetmaster/templates/puppet_cert_manager.pub.erb
@@ -1 +1 @@
-from="<%= scope.function_ipresolve([remote_cert_cleaner, 4]) %>" ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQC58c3tShWchHSCEGp4LeJ3hcKhfgNMSF3FFmblVbp5ZUQ7EyL23q2hBr6Wdo2WoWAiiZN7BvQRjoykMvCEJoUVr2Kot8T84pyzR+U1l7ASuuGMQF5z4ftyWT34icEzbTCPdsPx+yPOHfPn9N5i7B55+5D2/R2xgeZ6J0/ab+ZS6vZ+oNnMEvD29RmfwCYdOcVZH6O66Pi4e44kd78rhhLlws0G2XVRvng1Urte75KuBq57G6axFHq7oQyjOQ+yLLlYvr35nDruXZ5ggW2+i9x/6KbybSURWQpXOy8I4e0Uv7K+4fqC1XPwVGexsnmWcMeqbIPpijL+jKe8kq2Q89C9
labs_certs
+from="<%= remote_cert_cleaner %>" ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQC58c3tShWchHSCEGp4LeJ3hcKhfgNMSF3FFmblVbp5ZUQ7EyL23q2hBr6Wdo2WoWAiiZN7BvQRjoykMvCEJoUVr2Kot8T84pyzR+U1l7ASuuGMQF5z4ftyWT34icEzbTCPdsPx+yPOHfPn9N5i7B55+5D2/R2xgeZ6J0/ab+ZS6vZ+oNnMEvD29RmfwCYdOcVZH6O66Pi4e44kd78rhhLlws0G2XVRvng1Urte75KuBq57G6axFHq7oQyjOQ+yLLlYvr35nDruXZ5ggW2+i9x/6KbybSURWQpXOy8I4e0Uv7K+4fqC1XPwVGexsnmWcMeqbIPpijL+jKe8kq2Q89C9
labs_certs
--
To view, visit https://gerrit.wikimedia.org/r/204412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief6add47aecf73872edc95ddcc81977e8cf3b873
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
