Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/308886
Change subject: labstore: nfs-exports/nfs-exports-daemons settle on nfs-exportd
......................................................................
labstore: nfs-exports/nfs-exports-daemons settle on nfs-exportd
Right now the service is nfs-exports and the main file is
nfs-exports-daemon. Settle on nfs-exportd.
Change-Id: I82aa3a8f47c31b6f3c5be5f4a705ff3a25868729
---
M modules/labstore/files/start-nfs
M modules/labstore/manifests/fileserver/exports.pp
A modules/labstore/templates/initscripts/nfs-exportd.systemd.erb
D modules/labstore/templates/initscripts/nfs-exports.systemd.erb
4 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/308886/1
diff --git a/modules/labstore/files/start-nfs b/modules/labstore/files/start-nfs
index 4284c16..5661b18 100755
--- a/modules/labstore/files/start-nfs
+++ b/modules/labstore/files/start-nfs
@@ -45,7 +45,7 @@
# Start service to make sure that ip addresses for each project
# are maintained properly
-/bin/systemctl start nfs-exports
+/bin/systemctl start nfs-exportd
# Setup service IP
/sbin/ip addr add dev eth0 10.64.37.10/24
diff --git a/modules/labstore/manifests/fileserver/exports.pp
b/modules/labstore/manifests/fileserver/exports.pp
index bc2776f..8219377 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -51,11 +51,11 @@
require => File['/etc/nfs-mounts.yaml'],
}
- file { '/usr/local/bin/nfs-exports-daemon':
+ file { '/usr/local/bin/nfs-exportd':
owner => 'root',
group => 'root',
mode => '0555',
- source => 'puppet:///modules/labstore/nfs-exports-daemon',
+ source => 'puppet:///modules/labstore/nfs-exportd',
require => File['/usr/local/sbin/sync-exports'],
}
@@ -66,9 +66,9 @@
source => 'puppet:///modules/labstore/archive-project-volumes',
}
- base::service_unit { 'nfs-exports':
+ base::service_unit { 'nfs-exportd':
systemd => true,
declare_service => false,
- require => File['/usr/local/bin/nfs-exports-daemon'],
+ require => File['/usr/local/bin/nfs-exportd'],
}
}
diff --git a/modules/labstore/templates/initscripts/nfs-exportd.systemd.erb
b/modules/labstore/templates/initscripts/nfs-exportd.systemd.erb
new file mode 100644
index 0000000..e615dc7
--- /dev/null
+++ b/modules/labstore/templates/initscripts/nfs-exportd.systemd.erb
@@ -0,0 +1,7 @@
+[Unit]
+Description=NFS exports daemon
+
+[Service]
+ExecStart=/usr/local/bin/nfs-exportd --exports-d-path /etc/exports.d/
--config-path /etc/nfs-mounts.yaml
+Restart=on-failure
+User=nfsmanager
diff --git a/modules/labstore/templates/initscripts/nfs-exports.systemd.erb
b/modules/labstore/templates/initscripts/nfs-exports.systemd.erb
deleted file mode 100644
index 0e46715..0000000
--- a/modules/labstore/templates/initscripts/nfs-exports.systemd.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=NFS exports daemon
-
-[Service]
-ExecStart=/usr/local/bin/nfs-exports-daemon --exports-d-path /etc/exports.d/
--config-path /etc/nfs-mounts.yaml
-Restart=on-failure
-User=nfsmanager
--
To view, visit https://gerrit.wikimedia.org/r/308886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82aa3a8f47c31b6f3c5be5f4a705ff3a25868729
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
