X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site_type%2Fsriov-a13%2Ftemplates%2Fprofiles%2Fhost%2Fcp_r720.j2;h=3322a0fa67af80cfb714a3dd96296d5bdb7aa2b6;hb=refs%2Fchanges%2F13%2F1913%2F2;hp=b9ab3c9f9e823310085a3d506f83047fdfc90039;hpb=fbb206730195c6f03ded7658d08f1ef708ebf88b;p=yaml_builds.git

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 b9ab3c9..3322a0f 100644
--- 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,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:
@@ -86,13 +98,74 @@ data:
 
   metadata:
     owner_data:
-      openstack-l3-agent: enabled
+      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
+      openstack-nova-compute: enabled
+      openstack-libvirt: kernel
+      sriov: enabled
 ...
 ---
 schema: drydock/HostProfile/v1
 metadata:
   schema: metadata/Document/v1
-  name: cp_r740-secondary
+  name: cp_r720-secondary
   storagePolicy: cleartext
   layeringDefinition:
     abstract: false
@@ -129,6 +202,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:
@@ -174,61 +259,10 @@ 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
+      openstack-nova-compute: 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-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
-      influxdb: enabled
-      kibana: enabled
-      elasticsearch-client: enabled
-      elasticsearch-master: enabled
-      elasticsearch-data: enabled
-      postgresql: enabled
-      kube-ingress: enabled
+      tenant-ceph-osd: enabled
+      openstack-libvirt: kernel
+      sriov: enabled
       beta.kubernetes.io/fluentd-ds-ready: 'true'
-      node-exporter: enabled
 ...