Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173349
Change subject: remove glusterfs and pmtpa remnants
......................................................................
remove glusterfs and pmtpa remnants
Change-Id: I809ec95507cf64b4d6d25b9530e94f107c522ea1
---
M modules/ganglia_new/manifests/configuration.pp
M modules/ldap/manifests/client.pp
M modules/ldap/templates/autofs.default.erb
M modules/mariadb
M modules/openstack/files/havana/nova/virt-libvirt-driver
5 files changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/173349/1
diff --git a/modules/ganglia_new/manifests/configuration.pp
b/modules/ganglia_new/manifests/configuration.pp
index c182224..461ce20 100644
--- a/modules/ganglia_new/manifests/configuration.pp
+++ b/modules/ganglia_new/manifests/configuration.pp
@@ -65,9 +65,6 @@
'virt' => {
'name' => 'Virtualization cluster',
'id' => 29 },
- 'gluster' => {
- 'name' => 'Glusterfs cluster',
- 'id' => 30 },
'jobrunner' => {
'name' => 'Jobrunners',
'id' => 31 },
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 900d813..d5e31f5 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -278,9 +278,6 @@
$nfs_server_name = $instanceproject ? {
default => 'labs-nfs1',
}
- $gluster_server_name = $instanceproject ? {
- default => 'projectstorage.pmtpa.wmnet',
- }
$autofs_subscribe = ['/etc/ldap/ldap.conf', '/etc/ldap.conf',
'/etc/nslcd.conf', '/data', '/public']
} else {
$homedir_location = '/home'
diff --git a/modules/ldap/templates/autofs.default.erb
b/modules/ldap/templates/autofs.default.erb
index 0e7dd0c..c9e3076 100644
--- a/modules/ldap/templates/autofs.default.erb
+++ b/modules/ldap/templates/autofs.default.erb
@@ -123,5 +123,5 @@
# to "yes" otherwise it will not be used.
USE_MISC_DEVICE="no"
#
-OPTIONS="<% if has_variable?("gluster_server_name") then %>-DGSERVNAME=<%=
gluster_server_name %> <% end %><% if has_variable?("nfs_server_name") then
%>-DSERVNAME=<%= nfs_server_name %> <% end %><% if
has_variable?("nfs_server_name") then %>-DHOMEDIRLOC=<%= homedir_location %> <%
end %><% if has_variable?("instanceproject") then %>-DPROJECT=<%=
instanceproject %> <% end %>"
+OPTIONS="<% if has_variable?("nfs_server_name") then %>-DSERVNAME=<%=
nfs_server_name %> <% end %><% if has_variable?("nfs_server_name") then
%>-DHOMEDIRLOC=<%= homedir_location %> <% end %><% if
has_variable?("instanceproject") then %>-DPROJECT=<%= instanceproject %> <% end
%>"
#
diff --git a/modules/mariadb b/modules/mariadb
index 02cb5f6..65d4535 160000
--- a/modules/mariadb
+++ b/modules/mariadb
-Subproject commit 02cb5f6e9c6b960b4c437ed52d6da921e499ff55
+Subproject commit 65d45352a3eda13b26a238ce5447bbf759799e5e
diff --git a/modules/openstack/files/havana/nova/virt-libvirt-driver
b/modules/openstack/files/havana/nova/virt-libvirt-driver
index 9a60086..977854a 100644
--- a/modules/openstack/files/havana/nova/virt-libvirt-driver
+++ b/modules/openstack/files/havana/nova/virt-libvirt-driver
@@ -171,8 +171,6 @@
'sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver',
'nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver',
'aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver',
- 'glusterfs='
- 'nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver',
'fibre_channel=nova.virt.libvirt.volume.'
'LibvirtFibreChannelVolumeDriver',
'scality='
--
To view, visit https://gerrit.wikimedia.org/r/173349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I809ec95507cf64b4d6d25b9530e94f107c522ea1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
