X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fnetworks%2Fphysical%2Frack.j2;fp=templates%2Faic-clcp-manifests%2Fnetworks%2Fphysical%2Frack.j2;h=ff259a4cb517b2fd65d6a3c693a4faacfbe550e4;hb=refs%2Fchanges%2F69%2F369%2F1;hp=86cb1164213aad36e32489016928bf6c1632f393;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/networks/physical/rack.j2 b/templates/networks/physical/rack.j2
similarity index 91%
rename from templates/aic-clcp-manifests/networks/physical/rack.j2
rename to templates/networks/physical/rack.j2
index 86cb116..ff259a4 100644
--- a/templates/aic-clcp-manifests/networks/physical/rack.j2
+++ b/templates/networks/physical/rack.j2
@@ -1,6 +1,6 @@
 ---
 ##############################################################################
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.          #
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License.                   #
@@ -28,7 +28,7 @@ data:
     noconfig: enabled
   bonding:
     mode: disabled
-  mtu: 1500
+  mtu: 9000
   linkspeed: auto
   trunking:
     mode: disabled
@@ -50,7 +50,6 @@ data:
   routes:
   - subnet: '0.0.0.0/0'
     gateway: {{yaml.networks.oob.routes.gateway}}
-    metric: 100
   ranges:
   - type: static
     start: {{yaml.networks.oob.ranges.static.start}}
@@ -86,8 +85,10 @@ metadata:
     layer: site
   storagePolicy: cleartext
 data:
-  routedomain: provisioning
   cidr: {{yaml.networks.pxe.cidr}}
+  routes:
+  - subnet: '0.0.0.0/0'
+    gateway: {{yaml.networks.pxe.routes.gateway}}
   ranges:
   - type: reserved
     start: {{yaml.networks.pxe.ranges.reserved.start}}
@@ -98,6 +99,9 @@ data:
   - type: dhcp
     start: {{yaml.networks.pxe.ranges.dhcp.start}}
     end: {{yaml.networks.pxe.ranges.dhcp.end}}
+  dns:
+    domain: {{yaml.networks.pxe.dns.domain}}
+    servers: '{{yaml.networks.pxe.dns.servers}}'
 ...
 ---
 schema: 'drydock/NetworkLink/v1'
@@ -128,7 +132,7 @@ data:
     - oam
     - storage
     - overlay
-    - ksn
+    - calico
 ...
 ---
 schema: 'drydock/Network/v1'
@@ -141,11 +145,11 @@ metadata:
   storagePolicy: cleartext
 data:
   vlan: '{{yaml.networks.host.vlan}}'
+  mtu: 9000
   cidr: {{yaml.networks.host.cidr}}
   routes:
   - subnet: '0.0.0.0/0'
     gateway: {{yaml.networks.host.routes.gateway}}
-    metric: 100
   ranges:
   - type: reserved
     start: {{yaml.networks.host.ranges.reserved.start}}
@@ -153,6 +157,9 @@ data:
   - type: static
     start: {{yaml.networks.host.ranges.static.start}}
     end: {{yaml.networks.host.ranges.static.end}}
+  dns:
+    domain: {{yaml.networks.host.dns.domain}}
+    servers: '{{yaml.networks.host.dns.servers}}'
 ...
 ---
 schema: 'drydock/Network/v1'
@@ -168,9 +175,6 @@ data:
   mtu: 9000
   cidr: {{yaml.networks.storage.cidr}}
   ranges:
-  - type: reserved
-    start: {{yaml.networks.storage.ranges.reserved.start}}
-    end: {{yaml.networks.storage.ranges.reserved.end}}
   - type: static
     start: {{yaml.networks.storage.ranges.static.start}}
     end: {{yaml.networks.storage.ranges.static.end}}
@@ -179,38 +183,35 @@ data:
 schema: 'drydock/Network/v1'
 metadata:
   schema: 'metadata/Document/v1'
-  name: ksn
+  name: overlay
   layeringDefinition:
     abstract: false
     layer: site
   storagePolicy: cleartext
 data:
-  vlan: '44'
+  vlan: '{{yaml.networks.neutron.vlan}}'
   mtu: 9000
-  cidr: {{yaml.networks.ksn.cidr}}
+  cidr: {{yaml.networks.neutron.cidr}}
   ranges:
   - type: static
-    start: {{yaml.networks.ksn.ranges.static.start}}
-    end: {{yaml.networks.ksn.ranges.static.end}}
+    start: {{yaml.networks.neutron.ranges.static.start}}
+    end: {{yaml.networks.neutron.ranges.static.end}}
 ...
 ---
 schema: 'drydock/Network/v1'
 metadata:
   schema: 'metadata/Document/v1'
-  name: overlay
+  name: calico
   layeringDefinition:
     abstract: false
     layer: site
   storagePolicy: cleartext
 data:
-  vlan: '{{yaml.networks.neutron.vlan}}'
+  vlan: '{{yaml.networks.ksn.vlan}}'
   mtu: 9000
-  cidr: {{yaml.networks.neutron.cidr}}
+  cidr: {{yaml.networks.ksn.cidr}}
   ranges:
-  - type: reserved
-    start: {{yaml.networks.neutron.ranges.reserved.start}}
-    end: {{yaml.networks.neutron.ranges.reserved.end}}
   - type: static
-    start: {{yaml.networks.neutron.ranges.static.start}}
-    end: {{yaml.networks.neutron.ranges.static.end}}
+    start: {{yaml.networks.ksn.ranges.static.start}}
+    end: {{yaml.networks.ksn.ranges.static.end}}
 ...