Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert /system/archetype/os changes #181

Merged
merged 3 commits into from
Jun 5, 2018
Merged

Revert /system/archetype/os changes #181

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1711cec
Revert "Remove model from archetype"
jrha Jun 5, 2018
f842497
Revert "Replace /archetype/os with structure to model aquilon OS deta…
jrha Jun 5, 2018
9625c3c
Remove trailing white-space
jrha Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions quattor/types/aquilon.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,10 @@ type structure_cluster = {
"max_hosts" ? long(0..)
};

type structure_archetype_os = {
@{ Name of OS (i.e. aq --osname or aqdb OperatingSystem.name) }
"name" : string
@{ Version of OS (i.e. aq --osversion or aqdb OperatingSystem.version) }
"version" : string
};

type structure_archetype = {
"name" : string # e.g. "aquilon"
@{ Details of operating system as defined by aquilon broker }
"os" ? structure_archetype_os
"os" ? string # e.g. "linux"
"model" ? string # e.g. "4.0.1-x86_64"
"filesystem-layout" ? string with if_exists("archetype/filesystem-layouts/" + SELF) != ""
"archlist" ? string[] # e.g. fs sysname list for model,
# "x86_64.linux.2.6.glibc.2.3", "amd64.linux.2.4.glibc.2.3", ...
Expand Down