Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: set NFS export ACL from env
......................................................................
packaging: setup: set NFS export ACL from env
Change-Id: Ia35aaf42cb46247a2a02df1c2418f4613ad6b965
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/ovirt_engine_setup/constants.py
M packaging/setup/plugins/ovirt-engine-setup/system/exportfs.py
2 files changed, 22 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/22570/1
diff --git a/packaging/setup/ovirt_engine_setup/constants.py
b/packaging/setup/ovirt_engine_setup/constants.py
index c811e5f..d49c72d 100644
--- a/packaging/setup/ovirt_engine_setup/constants.py
+++ b/packaging/setup/ovirt_engine_setup/constants.py
@@ -645,6 +645,7 @@
FIREWALL_MANAGER_HUMAN = 'skip'
FIREWALL_MANAGER_IPTABLES = 'iptables'
FIREWALL_MANAGER_FIREWALLD = 'firewalld'
+ ISO_DOMAIN_NFS_DEFAULT_ACL = '0.0.0.0/0.0.0.0(rw)'
@util.export
@@ -926,6 +927,15 @@
@osetupattrs(
answerfile=True,
+ summary=True,
+ description=_('NFS export ACL'),
+ postinstallfile=True,
+ )
+ def ISO_DOMAIN_NFS_ACL(self):
+ return 'OVESETUP_CONFIG/isoDomainACL'
+
+ @osetupattrs(
+ answerfile=True,
postinstallfile=True
)
def ISO_DOMAIN_NAME(self):
diff --git a/packaging/setup/plugins/ovirt-engine-setup/system/exportfs.py
b/packaging/setup/plugins/ovirt-engine-setup/system/exportfs.py
index 20d4ee9..1963d13 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/system/exportfs.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/system/exportfs.py
@@ -73,6 +73,15 @@
self._conf = None
@plugin.event(
+ stage=plugin.Stages.STAGE_INIT,
+ )
+ def _init(self):
+ self.environment.setdefault(
+ osetupcons.ConfigEnv.ISO_DOMAIN_NFS_ACL,
+ osetupcons.Const.ISO_DOMAIN_NFS_DEFAULT_ACL
+ )
+
+ @plugin.event(
stage=plugin.Stages.STAGE_SETUP,
)
def _setup(self):
@@ -128,7 +137,9 @@
path = self.environment[
osetupcons.ConfigEnv.ISO_DOMAIN_NFS_MOUNT_POINT
]
- default_clients = '0.0.0.0/0.0.0.0(rw)'
+ default_clients = self.environment[
+ osetupcons.ConfigEnv.ISO_DOMAIN_NFS_ACL
+ ]
new_line = '{path}\t{clients}'.format(
path=path,
clients=default_clients,
--
To view, visit http://gerrit.ovirt.org/22570
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia35aaf42cb46247a2a02df1c2418f4613ad6b965
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yedidyah Bar David <d...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
