Aquilon schema: address @ned21 remarks on June 4

quattor · Jun 5, 2018 · 71673a9 · 71673a9
1 parent f8d920a
commit 71673a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/quattor/types/aquilon/hardware.pan b/quattor/types/aquilon/hardware.pan
@@ -1,4 +1,4 @@
-# This template extends the base schema with Aquilon-provied resources
+# This template extends the base schema with Aquilon-provided resources
 
 declaration template quattor/types/aquilon/hardware;
 
@@ -30,8 +30,6 @@ type structure_sysloc = {
     "room"       : string
     "bunker"     ? string
     "region"     ? string
-    "dns_search_domains" ? string[]
-    "location"   ? string
 };
 
 # All the resources in this type must be optional for

diff --git a/quattor/types/aquilon/system.pan b/quattor/types/aquilon/system.pan
@@ -1,3 +1,5 @@
+# This template extends the base schema with Aquilon-provided resources
+
 declaration template quattor/types/aquilon/system;
 
 @documentation{
@@ -47,6 +49,7 @@ type structure_cluster = {
     "max_hosts" ? long(0..)
 };
 
+@{ Details of operating system as defined by aquilon broker }
 type structure_archetype = {
     "name"          : string # e.g. "aquilon"
     "os"            : string # e.g. "linux"
@@ -106,7 +109,6 @@ type structure_personality = {
     "description"   ? string
     "class"         ? string with match(SELF, '(INFRASTRUCTURE|APPLICATION)')
     "users"         ? string[]
-    "systemgrn"     ? string[]
     "escalation"    ? string
     "notifyrules"   ? string
     "notifyhours"   ? string