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

diff --git a/templates/aic-clcp-manifests/baremetal/rack.j2 b/templates/baremetal/rack.j2
similarity index 62%
rename from templates/aic-clcp-manifests/baremetal/rack.j2
rename to templates/baremetal/rack.j2
index 22f0039..b6e6620 100644
--- a/templates/aic-clcp-manifests/baremetal/rack.j2
+++ b/templates/baremetal/rack.j2
@@ -1,5 +1,7 @@
+{% for server in yaml.masters %}
+---
 ##############################################################################
-# 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.                   #
@@ -13,9 +15,6 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 ##############################################################################
-
-{% for server in yaml.servers %}
----
 schema: 'drydock/BaremetalNode/v1'
 metadata:
   schema: 'metadata/Document/v1'
@@ -25,30 +24,65 @@ metadata:
     layer: site
   storagePolicy: cleartext
 data:
-  host_profile: MyControlPlane_HP 
+  host_profile: ControlPlane
   # the hostname for a server, could be used in multiple DNS domains to
   # represent different interfaces
   addressing:
       # Which network the address applies to. If a network appears in addressing
       # that isn't assigned to an interface, design validation will fail
+    - network: oob
+      address: {{server.oob}}
     - network: pxe
       # The address assigned. Either a explicit IPv4 or IPv6 address
       # or dhcp or slaac
       address: {{server.pxe}}
     - network: oam
       address: {{server.host}}
-    - network: ksn
-      address: {{server.ksn}}
     - network: storage
       address: {{server.storage}}
     - network: overlay
       address: {{server.neutron}}
+    - network: calico
+      address: {{server.ksn}}
+  metadata:
+    rack: RACK01
+    tags:
+      - 'masters'
+{% endfor %}
+{% for server in yaml.workers %}
+---
+schema: 'drydock/BaremetalNode/v1'
+metadata:
+  schema: 'metadata/Document/v1'
+  name: {{server.name}}
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: cleartext
+data:
+  host_profile: ComputePlane
+  # the hostname for a server, could be used in multiple DNS domains to
+  # represent different interfaces
+  addressing:
+      # Which network the address applies to. If a network appears in addressing
+      # that isn't assigned to an interface, design validation will fail
     - network: oob
       address: {{server.oob}}
+    - network: pxe
+      # The address assigned. Either a explicit IPv4 or IPv6 address
+      # or dhcp or slaac
+      address: {{server.pxe}}
+    - network: oam
+      address: {{server.host}}
+    - network: storage
+      address: {{server.storage}}
+    - network: overlay
+      address: {{server.neutron}}
+    - network: calico
+      address: {{server.ksn}}
   metadata:
-    rack: rack01
+    rack: RACK01
     tags:
-      - 'masters'
+      - 'workers'
 {% endfor %}
 ...
-