X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site%2Fhpgen10%2Fprofiles%2Fhost%2Fcp-r01.yaml;fp=site%2Fsite30%2Fprofiles%2Fhost%2Fcp-r01.yaml;h=605aa3b0ec34e53d90e30ee30621c9ad3a8c2d8c;hb=refs%2Fchanges%2F69%2F369%2F1;hp=7a686e0982fc7b4fe9cb6b512d19bfa3a03dfdbc;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git

diff --git a/site/site30/profiles/host/cp-r01.yaml b/site/hpgen10/profiles/host/cp-r01.yaml
similarity index 84%
rename from site/site30/profiles/host/cp-r01.yaml
rename to site/hpgen10/profiles/host/cp-r01.yaml
index 7a686e0..605aa3b 100644
--- a/site/site30/profiles/host/cp-r01.yaml
+++ b/site/hpgen10/profiles/host/cp-r01.yaml
@@ -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
@@ -38,7 +38,7 @@ data:
     network: 'oob'
     account: 'Administrator'
   primary_network: 'oam'
-  hardware_profile: DELL_HP_Generic 
+  hardware_profile: DELL_HP_Generic
   interfaces:
     pxe:
       device_link: pxe
@@ -56,6 +56,18 @@ data:
         - 'storage'
         - 'overlay'
         - '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:
       sdj:
@@ -64,7 +76,6 @@ data:
         partitions:
           - name: 'root'
             size: '20g'
-            bootable: true
             filesystem:
               mountpoint: '/'
               fstype: 'ext4'
@@ -92,8 +103,16 @@ data:
   platform:
     image: 'xenial'
     kernel: 'hwe-16.04'
-#    kernel_params:
-#      console: 'ttyS1,115200n8'
+    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
@@ -113,11 +132,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
@@ -149,8 +170,5 @@ data:
       postgresql: enabled
       kube-ingress: enabled
       sriov: enabled
-      openstack-nova-compute: enabled
-      openstack-libvirt: kernel
       beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...
-