From 1711cec13b69435dcda4bb85835bc0046b919068 Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 5 Jun 2018 10:25:14 +0100 Subject: [PATCH 1/3] Revert "Remove model from archetype" This reverts commit d46c050eaccd721009d864616a9e3cabdcf3dbae. --- quattor/types/aquilon.pan | 1 + 1 file changed, 1 insertion(+) diff --git a/quattor/types/aquilon.pan b/quattor/types/aquilon.pan index f8720d751..a4c782ba0 100644 --- a/quattor/types/aquilon.pan +++ b/quattor/types/aquilon.pan @@ -58,6 +58,7 @@ type structure_archetype = { "name" : string # e.g. "aquilon" @{ Details of operating system as defined by aquilon broker } "os" ? structure_archetype_os + "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", ... From f8424974cfb5ccda3974201fbe402fc024ce8788 Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 5 Jun 2018 10:25:26 +0100 Subject: [PATCH 2/3] Revert "Replace /archetype/os with structure to model aquilon OS details" This reverts commit 8ba24dc2c01e6a65fd1867803acbacb9887dbbba. --- quattor/types/aquilon.pan | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/quattor/types/aquilon.pan b/quattor/types/aquilon.pan index a4c782ba0..c8c71ae3d 100644 --- a/quattor/types/aquilon.pan +++ b/quattor/types/aquilon.pan @@ -46,18 +46,10 @@ type structure_cluster = { "node_index" ? long(0..) "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, @@ -153,7 +145,7 @@ type structure_security = { "class" : string with if_exists("archetype/security/" + SELF) != "" "svcwhitelist" ? list }; - + type structure_system_aquilon = { "advertise_status" ? boolean "archetype" ? structure_archetype From 9625c3ccf385aad3669114d33857e4c3a1d10361 Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 5 Jun 2018 10:30:26 +0100 Subject: [PATCH 3/3] Remove trailing white-space --- quattor/types/aquilon.pan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quattor/types/aquilon.pan b/quattor/types/aquilon.pan index c8c71ae3d..bc088962e 100644 --- a/quattor/types/aquilon.pan +++ b/quattor/types/aquilon.pan @@ -46,7 +46,7 @@ type structure_cluster = { "node_index" ? long(0..) "max_hosts" ? long(0..) }; - + type structure_archetype = { "name" : string # e.g. "aquilon" "os" ? string # e.g. "linux" @@ -145,7 +145,7 @@ type structure_security = { "class" : string with if_exists("archetype/security/" + SELF) != "" "svcwhitelist" ? list }; - + type structure_system_aquilon = { "advertise_status" ? boolean "archetype" ? structure_archetype