summaryrefslogtreecommitdiffstats
path: root/type
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@att.com>2019-08-15 10:08:21 -0500
committerKaspars Skels <kaspars.skels@att.com>2019-08-15 17:52:00 -0500
commitda8bd0499c80bc576531189ef35d250ca4ed1689 (patch)
tree60f1c3b5eb3b337d784f62f09f89f2c4734a5cd5 /type
parentd62d663a2daaf301c6ca5ae7d314e61b904af575 (diff)
Move ceph to SSD disk and CNTT type polish
Change-Id: Id661d4107efac128fd973c98f06805c44083e93f Signed-off-by: Kaspars Skels <kaspars.skels@att.com>
Diffstat (limited to 'type')
-rw-r--r--type/cntt/baremetal/bootactions/promjoin.yaml (renamed from type/cntt/bootactions/promjoin.yaml)0
-rw-r--r--type/cntt/profiles/host/dp-intel-s2600wt.yaml21
-rw-r--r--type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml6
-rw-r--r--type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml26
-rw-r--r--type/cntt/software/charts/ucp/ceph/ceph-client.yaml100
-rw-r--r--type/cntt/software/charts/ucp/ceph/ceph-osd.yaml30
-rw-r--r--type/cntt/software/charts/ucp/drydock/chart-group.yaml (renamed from type/cntt/software/charts/ucp/comps/chart-group.yaml)0
-rw-r--r--type/cntt/software/charts/ucp/drydock/drydock.yaml (renamed from type/cntt/software/charts/ucp/comps/drydock.yaml)0
-rw-r--r--type/cntt/software/charts/ucp/drydock/maas-scaled.yaml (renamed from type/cntt/software/charts/ucp/comps/maas-scaled.yaml)0
-rw-r--r--type/cntt/software/charts/ucp/drydock/maas.yaml (renamed from type/cntt/software/charts/ucp/comps/maas.yaml)0
10 files changed, 168 insertions, 15 deletions
diff --git a/type/cntt/bootactions/promjoin.yaml b/type/cntt/baremetal/bootactions/promjoin.yaml
index 1178c10..1178c10 100644
--- a/type/cntt/bootactions/promjoin.yaml
+++ b/type/cntt/baremetal/bootactions/promjoin.yaml
diff --git a/type/cntt/profiles/host/dp-intel-s2600wt.yaml b/type/cntt/profiles/host/dp-intel-s2600wt.yaml
index e05a2c7..49ece45 100644
--- a/type/cntt/profiles/host/dp-intel-s2600wt.yaml
+++ b/type/cntt/profiles/host/dp-intel-s2600wt.yaml
@@ -76,24 +76,21 @@ data:
mountpoint: '/var/log'
fstype: 'ext4'
mount_options: 'defaults'
- # - name: 'cephjournal'
- # size: '10g'
- name: 'var'
size: '>100g'
filesystem:
mountpoint: '/var'
fstype: 'ext4'
mount_options: 'defaults'
- # datadisk:
- # partitions:
- # - name: 'nova'
- # size: '450g'
- # filesystem:
- # mountpoint: '/var/lib/nova'
- # fstype: 'ext4'
- # mount_options: 'defaults'
- # - name: 'cephosd'
- # size: '>100g'
+
+ datadisk:
+ partitions:
+ - name: 'nova'
+ size: '99%'
+ filesystem:
+ mountpoint: '/var/lib/nova'
+ fstype: 'ext4'
+ mount_options: 'defaults'
platform:
image: 'xenial'
diff --git a/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml b/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
index 8937fdc..e991718 100644
--- a/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
+++ b/type/cntt/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
@@ -26,9 +26,9 @@ data:
storage:
osd:
- data:
- type: block-logical
- location: /dev/sdb
+ type: directory
+ location: /var/lib/tenant-ceph/osd/osd-one
journal:
type: directory
- location: /var/lib/openstack-helm/tenant-ceph/osd/osd-sdb
+ location: /var/lib/tenant-ceph/journal/osd-one
...
diff --git a/type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml b/type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml
new file mode 100644
index 0000000..eb921b8
--- /dev/null
+++ b/type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml
@@ -0,0 +1,26 @@
+---
+# The purpose of this file is to define environment-specific parameters for ceph
+# client update
+schema: armada/Chart/v1
+metadata:
+ schema: metadata/Document/v1
+ name: ucp-ceph-client-update
+ layeringDefinition:
+ abstract: false
+ layer: site
+ parentSelector:
+ name: ucp-ceph-client-update-global
+ actions:
+ - method: merge
+ path: .
+ storagePolicy: cleartext
+data:
+ values:
+ conf:
+ pool:
+ target:
+ # NEWSITE-CHANGEME: Total number of OSDs. Does not need to change if
+ # your HW matches this site's HW. Verify for your environment.
+ # 8 OSDs per node x 3 nodes = 24
+ osd: 3
+...
diff --git a/type/cntt/software/charts/ucp/ceph/ceph-client.yaml b/type/cntt/software/charts/ucp/ceph/ceph-client.yaml
new file mode 100644
index 0000000..e1e8ecf
--- /dev/null
+++ b/type/cntt/software/charts/ucp/ceph/ceph-client.yaml
@@ -0,0 +1,100 @@
+---
+# The purpose of this file is to define envrionment-specific parameters for the
+# ceph client
+schema: armada/Chart/v1
+metadata:
+ schema: metadata/Document/v1
+ name: ucp-ceph-client
+ layeringDefinition:
+ abstract: false
+ layer: site
+ parentSelector:
+ name: ucp-ceph-client-global
+ actions:
+ - method: merge
+ path: .
+ storagePolicy: cleartext
+data:
+ values:
+ conf:
+ pool:
+ target:
+ # NEWSITE-CHANGEME: The number of OSDs per ceph node. Does not need to
+ # change if your deployment HW matches this site's HW.
+ osd: 1
+ spec:
+ # RBD pool
+ - name: rbd
+ application: rbd
+ replication: 1
+ percent_total_data: 40
+ - name: cephfs_metadata
+ application: cephfs
+ replication: 1
+ percent_total_data: 5
+ - name: cephfs_data
+ application: cephfs
+ replication: 1
+ percent_total_data: 10
+ # RadosGW pools
+ - name: .rgw.root
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.control
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.data.root
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.gc
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.log
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.intent-log
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.meta
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.usage
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.users.keys
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.users.email
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.users.swift
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.users.uid
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.buckets.extra
+ application: rgw
+ replication: 1
+ percent_total_data: 0.1
+ - name: default.rgw.buckets.index
+ application: rgw
+ replication: 1
+ percent_total_data: 3
+ - name: default.rgw.buckets.data
+ application: rgw
+ replication: 1
+ percent_total_data: 34.8
+...
diff --git a/type/cntt/software/charts/ucp/ceph/ceph-osd.yaml b/type/cntt/software/charts/ucp/ceph/ceph-osd.yaml
new file mode 100644
index 0000000..25297d9
--- /dev/null
+++ b/type/cntt/software/charts/ucp/ceph/ceph-osd.yaml
@@ -0,0 +1,30 @@
+---
+# The purpose of this file is to define environment-specific parameters for
+# ceph-osd
+schema: armada/Chart/v1
+metadata:
+ schema: metadata/Document/v1
+ name: ucp-ceph-osd
+ layeringDefinition:
+ abstract: false
+ layer: site
+ parentSelector:
+ name: ucp-ceph-osd-global
+ actions:
+ - method: replace
+ path: .values.conf.storage.osd
+ - method: merge
+ path: .
+ storagePolicy: cleartext
+data:
+ values:
+ conf:
+ storage:
+ osd:
+ - data:
+ type: directory
+ location: /var/lib/ceph/osd/osd-one
+ journal:
+ type: directory
+ location: /var/lib/ceph/journal/osd-one
+...
diff --git a/type/cntt/software/charts/ucp/comps/chart-group.yaml b/type/cntt/software/charts/ucp/drydock/chart-group.yaml
index 02236b5..02236b5 100644
--- a/type/cntt/software/charts/ucp/comps/chart-group.yaml
+++ b/type/cntt/software/charts/ucp/drydock/chart-group.yaml
diff --git a/type/cntt/software/charts/ucp/comps/drydock.yaml b/type/cntt/software/charts/ucp/drydock/drydock.yaml
index 1343340..1343340 100644
--- a/type/cntt/software/charts/ucp/comps/drydock.yaml
+++ b/type/cntt/software/charts/ucp/drydock/drydock.yaml
diff --git a/type/cntt/software/charts/ucp/comps/maas-scaled.yaml b/type/cntt/software/charts/ucp/drydock/maas-scaled.yaml
index 531a9f3..531a9f3 100644
--- a/type/cntt/software/charts/ucp/comps/maas-scaled.yaml
+++ b/type/cntt/software/charts/ucp/drydock/maas-scaled.yaml
diff --git a/type/cntt/software/charts/ucp/comps/maas.yaml b/type/cntt/software/charts/ucp/drydock/maas.yaml
index d22cf55..d22cf55 100644
--- a/type/cntt/software/charts/ucp/comps/maas.yaml
+++ b/type/cntt/software/charts/ucp/drydock/maas.yaml