update node lables for tenant-ceph and nova

Update genensis, master primary and master secondary node labels
to enable tenenat-ceph and nova services.

Signed-off-by: davidplunkett <dp7642@att.com>
Change-Id: I43271746937056d4a8030a4fa1856d967871454a

diff --git a/site_type/sriov-a13/templates/baremetal/nodes.j2 b/site_type/sriov-a13/templates/baremetal/nodes.j2
index e786d86..20f978b 100644 (file)
--- a/site_type/sriov-a13/templates/baremetal/nodes.j2
+++ b/site_type/sriov-a13/templates/baremetal/nodes.j2
@@ -143,7 +143,11 @@ data:
     - network: calico
       address: {{server.ksn}}
   # NEWSITE-CHANGEME: The next node's host profile
+{% if loop.index < 3 %}
   host_profile: cp_r720-primary
+{% else %}
+  host_profile: cp_r720-secondary
+{% endif %}
   metadata:
     # NEWSITE-CHANGEME: The next node's rack designation
     rack: cab23

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..ac3a610 100644 (file)
--- a/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
+++ b/site_type/sriov-a13/templates/profiles/host/cp_r720.j2
@@ -86,7 +86,66 @@ 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
+      sriov: enabled
 ...
 ---
 schema: drydock/HostProfile/v1
@@ -174,61 +233,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
 ...

diff --git a/site_type/sriov-a13/treasuremap.tgz b/site_type/sriov-a13/treasuremap.tgz
index bd3d18d..8954c1a 100644 (file)
Binary files a/site_type/sriov-a13/treasuremap.tgz and b/site_type/sriov-a13/treasuremap.tgz differ