updated templates and scripts for Airship 1.3

[yaml_builds.git] / site_type / sriov-a13 / templates / profiles / host / cp_r720.j2

diff --git a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/profiles/host/cp_r720.yaml b/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
similarity index 64%
rename from site_type/sriov/airship-treasuremap/site/airship-seaworthy/profiles/host/cp_r720.yaml
rename to site_type/sriov-a13/templates/profiles/host/cp_r720.j2
index 3ace09a..b9ab3c9 100644 (file)
--- a/site_type/sriov/airship-treasuremap/site/airship-seaworthy/profiles/host/cp_r720.yaml
+++ b/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
@@ -21,24 +21,21 @@ metadata:
       - method: merge
         path: .
 data:
-  # TODO: fixup proper HW profiles
-  hardware_profile: DELL_HP_Generic
+  hardware_profile: dell_r720
 
   primary_network: oam
   interfaces:
     pxe:
       device_link: pxe
       slaves:
-        - eno1
+        - pxe_nic01
       networks:
         - pxe
     bond0:
       device_link: data
       slaves:
-        - enp67s0f0
-        - enp67s0f1
-        - enp68s0f0
-        - enp68s0f1
+        - data_nic01
+        - data_nic02
       networks:
         - oam
         - storage
@@ -47,48 +44,45 @@ data:
 
   storage:
     physical_devices:
-      sda:
+{% for disk in yaml.disks %}
+      {{disk.name}}:
+      {% if 'labels' in disk %}
         labels:
-          bootdrive: 'true'
+        {% for key, value in disk.labels.items() %}
+          {{key}}: '{{value}}'
+        {% endfor %}
+      {% endif %}
         partitions:
-          - name: 'root'
-            size: '30g'
-            bootable: true
+       {% for p in disk.partitions %}
+          - name: '{{p.name}}'
+            size: '{{p.size}}'
+            {% if 'bootable' in p %}
+            bootable: {{p.bootable}}
+            {% endif %}
             filesystem:
-              mountpoint: '/'
+              mountpoint: '{{p.mountpoint}}'
               fstype: 'ext4'
               mount_options: 'defaults'
-          - name: 'boot'
-            size: '1g'
-            filesystem:
-              mountpoint: '/boot'
-              fstype: 'ext4'
-              mount_options: 'defaults'
-          - name: 'var_log'
-            size: '100g'
-            filesystem:
-              mountpoint: '/var/log'
-              fstype: 'ext4'
-              mount_options: 'defaults'
-          - name: 'var'
-            size: '>100g'
-            filesystem:
-              mountpoint: '/var'
-              fstype: 'ext4'
-              mount_options: 'defaults'
-      sdb:
-        partitions:
-          - name: 'cephj'
-            size: '100g'
-            filesystem:
-              mountpoint: '/var/lib/ceph/cp'
-              fstype: 'xfs'
-              mount_options: 'defaults'
+      {% endfor %}
+{% endfor %}
 
   platform:
     kernel: 'hwe-16.04'
     kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+      {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
       console: 'ttyS1,115200n8'
+      intel_iommu: 'on'
+      iommu: 'pt'
+      amd_iommu: 'on'
+      transparent_hugepage: 'never'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+      isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
 
   metadata:
     owner_data:
@@ -115,24 +109,21 @@ metadata:
       - method: merge
         path: .
 data:
-  # TODO: fixup proper HW profiles
-  hardware_profile: DELL_HP_Generic
+  hardware_profile: dell_r720
 
   primary_network: oam
   interfaces:
     pxe:
       device_link: pxe
       slaves:
-        - eno1
+        - pxe_nic01
       networks:
         - pxe
     bond0:
       device_link: data
       slaves:
-        - enp67s0f0
-        - enp67s0f1
-        - enp68s0f0
-        - enp68s0f1
+        - data_nic01
+        - data_nic02
       networks:
         - oam
         - storage
@@ -141,48 +132,45 @@ data:
 
   storage:
     physical_devices:
-      sda:
+{% for disk in yaml.disks %}
+      {{disk.name}}:
+      {% if 'labels' in disk %}
         labels:
-          bootdrive: 'true'
+        {% for key, value in disk.labels.items() %}
+          {{key}}: '{{value}}'
+        {% endfor %}
+      {% endif %}
         partitions:
-          - name: 'root'
-            size: '30g'
-            bootable: true
+       {% for p in disk.partitions %}
+          - name: '{{p.name}}'
+            size: '{{p.size}}'
+            {% if 'bootable' in p %}
+            bootable: {{p.bootable}}
+            {% endif %}
             filesystem:
-              mountpoint: '/'
+              mountpoint: '{{p.mountpoint}}'
               fstype: 'ext4'
               mount_options: 'defaults'
-          - name: 'boot'
-            size: '1g'
-            filesystem:
-              mountpoint: '/boot'
-              fstype: 'ext4'
-              mount_options: 'defaults'
-          - name: 'var_log'
-            size: '100g'
-            filesystem:
-              mountpoint: '/var/log'
-              fstype: 'ext4'
-              mount_options: 'defaults'
-          - name: 'var'
-            size: '>100g'
-            filesystem:
-              mountpoint: '/var'
-              fstype: 'ext4'
-              mount_options: 'defaults'
-      sdb:
-        partitions:
-          - name: 'cephj'
-            size: '100g'
-            filesystem:
-              mountpoint: '/var/lib/ceph/cp'
-              fstype: 'xfs'
-              mount_options: 'defaults'
+      {% endfor %}
+{% endfor %}
 
   platform:
     kernel: 'hwe-16.04'
     kernel_params:
+{% if 'platform' in yaml and 'kernel_params' in yaml.platform %}
+{% for key, value in yaml.platform.kernel_params.items() %}
+      {{key}}: '{{value}}'
+{% endfor %}
+{% else %}
       console: 'ttyS1,115200n8'
+      intel_iommu: 'on'
+      iommu: 'pt'
+      amd_iommu: 'on'
+      transparent_hugepage: 'never'
+{% endif %}
+{% if 'platform' in yaml and 'vcpu_pin_set' in yaml.platform %}
+      isolcpus: '{{yaml.platform.vcpu_pin_set}}'
+{% endif %}
 
   metadata:
     owner_data:
@@ -205,7 +193,6 @@ data:
       openstack-neutron: enabled
       openvswitch: enabled
       ucp-barbican: enabled
-      ceph-bootstrap: enabled
       # ceph-mon: enabled
       ceph-mgr: enabled
       ceph-osd: enabled
@@ -213,6 +200,10 @@ data:
       ceph-rgw: enabled
       ucp-maas: enabled
       kube-dns: enabled
+      tenant-ceph-control-plane: enabled
+      # tenant-ceph-mon: enabled
+      tenant-ceph-rgw: enabled
+      tenant-ceph-mgr: enabled
       kubernetes-apiserver: enabled
       kubernetes-controller-manager: enabled
       # kubernetes-etcd: enabled