Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Try nfs and nfs-server
......................................................................
packaging: Try nfs and nfs-server
When configuring the NFS service we need to try with both names, as some
distributions use one of them and other distributions use the other.
Change-Id: I5cdb4c1d0930a058f42d63d37fcab647391754ac
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
(cherry picked from commit ec09f0381d193949c2660ed64bcad80c0f641f04)
---
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-setup.py
2 files changed, 22 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/12864/1
diff --git a/packaging/fedora/setup/basedefs.py
b/packaging/fedora/setup/basedefs.py
index 6822183..a87eb8f 100644
--- a/packaging/fedora/setup/basedefs.py
+++ b/packaging/fedora/setup/basedefs.py
@@ -19,7 +19,6 @@
ENGINE_GROUP_NAME="ovirt"
HTTPD_SERVICE_NAME="httpd"
HTTP_PORT_POLICY="http_port_t"
-NFS_SERVICE_NAME="nfs-server"
NOTIFIER_SERVICE_NAME = "engine-notifierd"
ETL_SERVICE_NAME = "ovirt-engine-dwhd"
FREEIPA_RPM = "freeipa-server"
diff --git a/packaging/fedora/setup/engine-setup.py
b/packaging/fedora/setup/engine-setup.py
index 29af270..27a9165 100755
--- a/packaging/fedora/setup/engine-setup.py
+++ b/packaging/fedora/setup/engine-setup.py
@@ -1822,12 +1822,29 @@
def _startNfsServices():
logging.debug("Enabling the rpcbind & nfs services")
+
+ # The collection of services needed to have NFS working:
+ services = []
+
+ # First we need the rpcbind service:
+ rpcbindService = utils.Service("rpcbind")
+ services.append(rpcbindService)
+
+ # Then we need the NFS service itself, but its name is "nfs-service"
+ # in some distributions like Fedora 18 and just "nfs" in other
+ # distributions like RHEL or CentOS:
+ for nfsServiceName in ["nfs-service", "nfs"]:
+ nfsService = utils.Service(nfsServiceName)
+ if nfsService.available():
+ services.append(nfsService)
+ break
+
+ # Start the services:
try:
- for service in ["rpcbind", basedefs.NFS_SERVICE_NAME]:
- srv = utils.Service(service)
- srv.autoStart(True)
- srv.stop(False)
- srv.start(True)
+ for service in services:
+ service.autoStart(True)
+ service.stop(False)
+ service.start(True)
except:
logging.error(traceback.format_exc())
raise Exception(output_messages.ERR_FAILED_TO_START_NFS_SERVICE)
--
To view, visit http://gerrit.ovirt.org/12864
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cdb4c1d0930a058f42d63d37fcab647391754ac
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
