Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory-plugins
Commits
78c8231d
Verified
Commit
78c8231d
authored
6 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
feat(argonaut-fuse) Add options to change FAI cmdline
issue
#5845
parent
68f122fd
dev
6104-mail-methods-refactor
6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued
6237-add-requiredattrs-array-to-the-webservice-informations
6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines
6250-supann-configuration-backend-requires-account-life-cycle-section
6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure
6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id
6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5
6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2
6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases
6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user
6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects
6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc
+28
-0
...systems/services/argonaut/class_argonautFuseFAIConfig.inc
argonaut/contrib/openldap/argonaut-fd.schema
+14
-1
argonaut/contrib/openldap/argonaut-fd.schema
with
42 additions
and
1 deletion
+42
-1
argonaut/admin/systems/services/argonaut/class_argonautFuseFAIConfig.inc
+
28
−
0
View file @
78c8231d
...
@@ -56,6 +56,34 @@ class argonautFuseFAIConfig extends simplePlugin
...
@@ -56,6 +56,34 @@ class argonautFuseFAIConfig extends simplePlugin
'argonautFuseNfsRoot'
,
TRUE
,
'argonautFuseNfsRoot'
,
TRUE
,
'/srv/fai/nfsroot'
'/srv/fai/nfsroot'
),
),
new
StringAttribute
(
_
(
'FAI 4 command line'
),
_
(
'Command line for FAI 4 - should be "ip=dhcp root=/dev/nfs boot=live union=aufs"'
),
'argonautFuseFai4Cmdline'
,
TRUE
,
'ip=dhcp root=/dev/nfs boot=live union=aufs'
),
new
StringAttribute
(
_
(
'FAI 5 command line'
),
_
(
'Command line for FAI 5 - should be "ip=dhcp rootovl"'
),
'argonautFuseFai5Cmdline'
,
TRUE
,
'ip=dhcp rootovl'
),
)
)
);
}
function
__construct
(
$dn
=
NULL
,
$object
=
NULL
,
$parent
=
NULL
,
$mainTab
=
FALSE
,
$attributesInfo
=
NULL
)
{
parent
::
__construct
(
$dn
,
$object
,
$parent
,
$mainTab
,
$attributesInfo
);
$this
->
attributesAccess
[
'argonautFuseFaiVersion'
]
->
setManagedAttributes
(
array
(
'disable'
=>
array
(
4
=>
array
(
'argonautFuseFai5Cmdline'
),
5
=>
array
(
'argonautFuseFai4Cmdline'
)
)
)
)
)
);
);
...
...
This diff is collapsed.
Click to expand it.
argonaut/contrib/openldap/argonaut-fd.schema
+
14
−
1
View file @
78c8231d
...
@@ -338,6 +338,18 @@ attributetype ( 1.3.6.1.4.1.38414.2.14.12 NAME 'argonautFuseFaiVersion'
...
@@ -338,6 +338,18 @@ attributetype ( 1.3.6.1.4.1.38414.2.14.12 NAME 'argonautFuseFaiVersion'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE )
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.14.13 NAME 'argonautFuseFai4Cmdline'
DESC 'Fusion Directory - Argonaut, fuse command line for FAI 4 - should be "ip=dhcp root=/dev/nfs boot=live union=aufs".'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.14.14 NAME 'argonautFuseFai5Cmdline'
DESC 'Fusion Directory - Argonaut, fuse command line for FAI 5 - should be "ip=dhcp rootovl".'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.2.15.1 NAME 'argonautFAIMonitorPort'
attributetype ( 1.3.6.1.4.1.38414.2.15.1 NAME 'argonautFAIMonitorPort'
DESC 'Fusion Directory - Argonaut FAI monitor, port.'
DESC 'Fusion Directory - Argonaut FAI monitor, port.'
EQUALITY integerMatch
EQUALITY integerMatch
...
@@ -426,7 +438,8 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.7 NAME 'argonautFuseFAIConfig'
...
@@ -426,7 +438,8 @@ objectclass ( 1.3.6.1.4.1.38414.2.2.7 NAME 'argonautFuseFAIConfig'
DESC 'An argonaut config for fuse FAI module'
DESC 'An argonaut config for fuse FAI module'
SUP top AUXILIARY
SUP top AUXILIARY
MUST ( argonautFuseNfsRoot )
MUST ( argonautFuseNfsRoot )
MAY ( argonautFuseFaiVersion $ argonautFuseFaiFlags ) )
MAY ( argonautFuseFaiVersion $ argonautFuseFaiFlags $
argonautFuseFai4Cmdline $ argonautFuseFai5Cmdline ) )
objectclass ( 1.3.6.1.4.1.38414.2.2.8 NAME 'argonautFuseLTSPConfig'
objectclass ( 1.3.6.1.4.1.38414.2.2.8 NAME 'argonautFuseLTSPConfig'
DESC 'An argonaut config for fuse LTSP module'
DESC 'An argonaut config for fuse LTSP module'
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets