updated templates for sriov-a13 site type

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

diff --git a/site_type/sriov-a13/templates/profiles/host/cp_r720.j2 b/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
index 3322a0f..3a1270f 100644 (file)
--- a/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
+++ b/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
@@ -41,6 +41,15 @@ data:
         - storage
         - overlay
         - calico
+{% if 'dpdk' in yaml %}
+    dpdk:
+      device_link: dpdk
+      slaves:
+        - dpdk_nic01
+      networks:
+        - dpdk
+{% endif %}
+{% if 'sriov' in yaml %}
     p1p1:
       slaves:
         - 'sriov_nic01'
@@ -53,7 +62,7 @@ data:
       sriov:
         vf_count: 32 # Currently ignored
         trustedmode: false
-
+{% endif %}
   storage:
     physical_devices:
 {% for disk in yaml.disks %}
@@ -98,65 +107,8 @@ data:
 
   metadata:
     owner_data:
-      control-plane: enabled
-      ucp-control-plane: enabled
-      openstack-control-plane: enabled
-      openstack-heat: enabled
-      openstack-keystone: enabled
-      openstack-rabbitmq: enabled
-      openstack-dns-helper: enabled
-      openstack-mariadb: enabled
-      openstack-nova-control: enabled
-      # openstack-etcd: enabled
-      openstack-mistral: enabled
-      openstack-memcached: enabled
-      openstack-glance: enabled
-      openstack-horizon: enabled
-      openstack-cinder-control: enabled
-      openstack-cinder-volume: control
-      openstack-neutron: enabled
-      openvswitch: enabled
-      ucp-barbican: enabled
-      ceph-mon: enabled
-      ceph-mgr: enabled
-      ceph-osd: enabled
-      ceph-mds: enabled
-      ceph-rgw: enabled
-      ucp-maas: enabled
-      kube-dns: enabled
-      tenant-ceph-control-plane: enabled
-      tenant-ceph-mon: enabled
       tenant-ceph-osd: enabled
-      tenant-ceph-rgw: enabled
-      tenant-ceph-mgr: enabled
-      kubernetes-apiserver: enabled
-      kubernetes-controller-manager: enabled
-      kubernetes-etcd: enabled
-      kubernetes-scheduler: enabled
-      tiller-helm: enabled
-      kube-etcd: enabled
-      calico-policy: enabled
-      calico-node: enabled
-      calico-etcd: enabled
-      ucp-armada: enabled
-      ucp-drydock: enabled
-      ucp-deckhand: enabled
-      ucp-shipyard: enabled
-      IAM: enabled
-      ucp-promenade: enabled
-      prometheus-server: enabled
-      prometheus-client: enabled
-      fluentd: enabled
-      fluentbit: enabled
-      influxdb: enabled
-      kibana: enabled
-      elasticsearch-client: enabled
-      elasticsearch-master: enabled
-      elasticsearch-data: enabled
-      postgresql: enabled
-      kube-ingress: enabled
-      beta.kubernetes.io/fluentd-ds-ready: 'true'
-      node-exporter: enabled
+      ucp-maas: enabled
       openstack-nova-compute: enabled
       openstack-libvirt: kernel
       sriov: enabled
@@ -202,6 +154,15 @@ data:
         - storage
         - overlay
         - calico
+{% if 'dpdk' in yaml %}
+    dpdk:
+      device_link: dpdk
+      slaves:
+        - dpdk_nic01
+      networks:
+        - dpdk
+{% endif %}
+{% if 'sriov' in yaml %}
     p1p1:
       slaves:
         - 'sriov_nic01'
@@ -214,7 +175,7 @@ data:
       sriov:
         vf_count: 32 # Currently ignored
         trustedmode: false
-
+{% endif %}
   storage:
     physical_devices:
 {% for disk in yaml.disks %}
@@ -259,10 +220,11 @@ data:
 
   metadata:
     owner_data:
-      openstack-nova-compute: enabled
-      openvswitch: enabled
+      ceph-mon: disabled
+      tenant-ceph-mon: disabled
       tenant-ceph-osd: enabled
+      ucp-maas: enabled
+      openstack-nova-compute: enabled
       openstack-libvirt: kernel
       sriov: enabled
-      beta.kubernetes.io/fluentd-ds-ready: 'true'
 ...