Clean up some YAML formatting

examples/bootstrap_hwdefinition.yaml

@@ -18,10 +18,11 @@
 #############################################################################
 # version the schema in this file so consumers can rationally parse it
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: HardwareProfile
 metadata:
   name: HPGen8v3
+  region: sitename
   date: 17-FEB-2017
   name: Sample hardware definition
   author: Scott Hussey
@@ -31,7 +32,7 @@ spec:
   # Generation of the chassis model
   generation: 8
   # Version of the chassis model within its generation - not version of the hardware definition
-  version: 3
+  hw_version: 3
   # The certified version of the chassis BIOS
   bios_version: 2.2.3
   # Mode of the default boot of hardware - bios, uefi
@@ -52,6 +53,6 @@ spec:
       alias: prim_nic02
       type: '82540EM Gigabit Ethernet Controller'
     scsi:
-      address: scsi@2:0.0.0
+    - address: scsi@2:0.0.0
       alias: primary_boot
       type: 'VBOX HARDDISK'

examples/bootstrap_seed.yaml

@@ -18,8 +18,8 @@
 ####################
 # version the schema in this file so consumers can rationally parse it
 ---
-apiVersion: v1
+apiVersion: 1.0
-kind: Site
+kind: Region
 metadata:
   name: sitename
   date: 17-FEB-2017
@@ -28,16 +28,16 @@ metadata:
 spec:
   # Not sure if we have site wide data that doesn't fall into another 'Kind'
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: NetworkLink
 metadata:
   name: oob
+  region: sitename
   date: 17-FEB-2017
   name: Sample network link
   author: sh8121@att.com
   description: Describe layer 1 attributes. Primary key is 'name'. These settings will generally be things the switch and server have to agree on
 spec:
-  name: oob
   bonding:
     mode: none
   mtu: 1500
@@ -49,10 +49,11 @@ spec:
 # pxe is a bit of 'magic' indicating the link config used when PXE booting
 # a node. All other links indicate network configs applied when the node
 # is deployed.
-apiVersion: v1
+apiVersion: 1.0
 kind: NetworkLink
 metadata:
   name: pxe
+  region: sitename
   date: 17-FEB-2017
   name: Sample network link
   author: sh8121@att.com
@@ -70,10 +71,11 @@ spec:
     # use name, will translate to VLAN ID
     default_network: pxe
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: NetworkLink
 metadata:
   name: gp
+  region: sitename
   date: 17-FEB-2017
   name: Sample network link
   author: sh8121@att.com
@@ -107,6 +109,7 @@ apiVersion: v1
 kind: Network
 metadata:
   name: oob
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -126,6 +129,7 @@ apiVersion: v1
 kind: Network
 metadata:
   name: pxe
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -151,10 +155,11 @@ spec:
       # DNS servers that a server using this network as its default gateway should use
     servers: 172.16.0.10
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: Network
 metadata:
   name: mgmt
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -178,7 +183,7 @@ spec:
         # A blank gateway would leave to a static route specifying
         # only the interface as a source
     gateway: 172.16.1.1
-    weight: 10
+    metric: 10
     # DNS settings for this network
   dns:
       # Domain addresses on this network will be registered under
@@ -186,10 +191,11 @@ spec:
       # DNS servers that a server using this network as its default gateway should use
     servers: 172.16.1.9,172.16.1.10
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: Network
 metadata:
   name: private
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -210,10 +216,11 @@ spec:
     domain: priv.sitename.example.com
     servers: 172.16.2.9,172.16.2.10
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: Network
 metadata:
   name: public
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -233,15 +240,16 @@ spec:
   routes:
   - subnet: 0.0.0.0/0
     gateway: 172.16.3.1
-    weight: 9
+    metric: 9
   dns:
     domain: sitename.example.com
     servers: 8.8.8.8
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: HostProfile
 metadata:
   name: default
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -297,10 +305,11 @@ spec:
     # Base URL of the introspection service - may go in curtin data
     introspection_url: http://172.16.1.10:9090
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: HostProfile
 metadata:
   name: k8-node
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -351,10 +360,11 @@ spec:
     owner_data:
       foo: bar
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: HostProfile
 metadata:
   name: k8-node-public
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -368,10 +378,11 @@ spec:
         # inheritance chain
       - name: public
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: BaremetalNode
 metadata:
   name: controller01
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com
@@ -401,10 +412,11 @@ spec:
     roles: os_ctl
     rack: rack01
 ---
-apiVersion: v1
+apiVersion: 1.0
 kind: BaremetalNode
 metadata:
   name: compute01
+  region: sitename
   date: 17-FEB-2017
   name: Sample network definition
   author: sh8121@att.com