X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=templates%2Fprofiles%2Fhost%2Fcp-r01.j2;fp=templates%2Faic-clcp-manifests%2Fprofiles%2Fhost%2Fmycontrolplane_hp.j2;h=e59df9175084509aaaf94582195a18452e3d7c56;hb=refs%2Fchanges%2F69%2F369%2F1;hp=822e2b48df5aa0d1a3de5aeef1a6a648588d1188;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/templates/aic-clcp-manifests/profiles/host/mycontrolplane_hp.j2 b/templates/profiles/host/cp-r01.j2
similarity index 82%
rename from templates/aic-clcp-manifests/profiles/host/mycontrolplane_hp.j2
rename to templates/profiles/host/cp-r01.j2
index 822e2b4..e59df91 100644
--- a/templates/aic-clcp-manifests/profiles/host/mycontrolplane_hp.j2
+++ b/templates/profiles/host/cp-r01.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.                   #
@@ -18,10 +18,10 @@
 schema: drydock/HostProfile/v1
 metadata:
   schema: metadata/Document/v1
-  name: MyControlPlane_HP
+  name: ControlPlane
   storagePolicy: cleartext
   labels:
-    hosttype: MyControlPlane_HP
+    hosttype: ControlPlane
   layeringDefinition:
     abstract: false
     layer: site
@@ -36,14 +36,14 @@ data:
   oob:
     type: 'ipmi'
     network: 'oob'
-    account: 'administrator'
+    account: '{{yaml.ipmi_admin.username}}'
   primary_network: 'oam'
   hardware_profile: DELL_HP_Generic
   interfaces:
     pxe:
       device_link: pxe
       slaves:
-        - 'eno1'
+        - '{{yaml.networks.pxe.interface}}'
       networks:
         - 'pxe'
     bond0:
@@ -56,7 +56,19 @@ data:
         - 'oam'
         - 'storage'
         - 'overlay'
-        - 'ksn'
+        - 'calico'
+    p1p1:
+      slaves:
+        - 'sriov_nic01'
+      sriov:
+        vf_count: 32 # Currently ignored
+        trustedmode: false
+    p3p2:
+      slaves:
+        - 'sriov_nic02'
+      sriov:
+        vf_count: 32 # Currently ignored
+        trustedmode: false
   storage:
     physical_devices:
 {% for disk in yaml.disks %}
@@ -82,6 +94,14 @@ data:
     kernel: 'hwe-16.04'
     kernel_params:
       console: 'ttyS1,115200n8'
+      intel_iommu: 'on'
+      iommu: 'pt'
+      amd_iommu: 'on'
+      transparent_hugepage: 'never'
+      hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
+      hugepages: 'hardwareprofile:hugepages.dpdk.count'
+      default_hugepagesz: 'hardwareprofile:hugepages.dpdk.size'
+      isolcpus: 'hardwareprofile:cpuset.kvm'
   metadata:
     owner_data:
       control-plane: enabled
@@ -101,11 +121,13 @@ data:
       openstack-cinder-control: enabled
       openstack-cinder-volume: control
       openstack-neutron: enabled
+      openstack-libvirt: kernel
       openvswitch: enabled
-      sriov: enabled
+      openstack-nova-compute: enabled
       ucp-barbican: enabled
       ceph-bootstrap: enabled
       ceph-mon: enabled
+      ceph-mgr: enabled
       ceph-osd: enabled
       ceph-mds: enabled
       ceph-rgw: enabled