From da8bd0499c80bc576531189ef35d250ca4ed1689 Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Thu, 15 Aug 2019 10:08:21 -0500 Subject: Move ceph to SSD disk and CNTT type polish Change-Id: Id661d4107efac128fd973c98f06805c44083e93f Signed-off-by: Kaspars Skels --- .../charts/osh/openstack-tenant-ceph/ceph-osd.yaml | 6 +- .../charts/ucp/ceph/ceph-client-update.yaml | 26 ++++++ .../cntt/software/charts/ucp/ceph/ceph-client.yaml | 100 +++++++++++++++++++++ type/cntt/software/charts/ucp/ceph/ceph-osd.yaml | 30 +++++++ .../software/charts/ucp/comps/chart-group.yaml | 14 --- type/cntt/software/charts/ucp/comps/drydock.yaml | 25 ------ .../software/charts/ucp/comps/maas-scaled.yaml | 32 ------- type/cntt/software/charts/ucp/comps/maas.yaml | 29 ------ .../software/charts/ucp/drydock/chart-group.yaml | 14 +++ type/cntt/software/charts/ucp/drydock/drydock.yaml | 25 ++++++ .../software/charts/ucp/drydock/maas-scaled.yaml | 32 +++++++ type/cntt/software/charts/ucp/drydock/maas.yaml | 29 ++++++ 12 files changed, 259 insertions(+), 103 deletions(-) create mode 100644 type/cntt/software/charts/ucp/ceph/ceph-client-update.yaml create mode 100644 type/cntt/software/charts/ucp/ceph/ceph-client.yaml create mode 100644 type/cntt/software/charts/ucp/ceph/ceph-osd.yaml delete mode 100644 type/cntt/software/charts/ucp/comps/chart-group.yaml delete mode 100644 type/cntt/software/charts/ucp/comps/drydock.yaml delete mode 100644 type/cntt/software/charts/ucp/comps/maas-scaled.yaml delete mode 100644 type/cntt/software/charts/ucp/comps/maas.yaml create mode 100644 type/cntt/software/charts/ucp/drydock/chart-group.yaml create mode 100644 type/cntt/software/charts/ucp/drydock/drydock.yaml create mode 100644 type/cntt/software/charts/ucp/drydock/maas-scaled.yaml create mode 100644 type/cntt/software/charts/ucp/drydock/maas.yaml (limited to 'type/cntt/software') 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/comps/chart-group.yaml deleted file mode 100644 index 02236b5..0000000 --- a/type/cntt/software/charts/ucp/comps/chart-group.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -schema: armada/ChartGroup/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-drydock-scaled - layeringDefinition: - abstract: false - layer: type - storagePolicy: cleartext -data: - description: Drydock - chart_group: - - ucp-maas-scaled - - ucp-drydock diff --git a/type/cntt/software/charts/ucp/comps/drydock.yaml b/type/cntt/software/charts/ucp/comps/drydock.yaml deleted file mode 100644 index 1343340..0000000 --- a/type/cntt/software/charts/ucp/comps/drydock.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - replacement: true - name: ucp-drydock - labels: - name: ucp-drydock-type - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: ucp-drydock-global - actions: - - method: merge - path: . - storagePolicy: cleartext -data: - values: - network: - api: - ingress: - classes: - cluster: maas-ingress -... diff --git a/type/cntt/software/charts/ucp/comps/maas-scaled.yaml b/type/cntt/software/charts/ucp/comps/maas-scaled.yaml deleted file mode 100644 index 531a9f3..0000000 --- a/type/cntt/software/charts/ucp/comps/maas-scaled.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-maas-scaled - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: ucp-maas-global - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .vip.maas_vip - dest: - path: .values.network.maas_ingress.addr -data: - values: - network: - region_api: - node_port: - enabled: true - pod: - replicas: - region: 2 - rack: 2 -... diff --git a/type/cntt/software/charts/ucp/comps/maas.yaml b/type/cntt/software/charts/ucp/comps/maas.yaml deleted file mode 100644 index d22cf55..0000000 --- a/type/cntt/software/charts/ucp/comps/maas.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# This file defines site-specific deviations for MaaS. -schema: armada/Chart/v1 -metadata: - schema: metadata/Document/v1 - name: ucp-maas - layeringDefinition: - abstract: false - layer: type - parentSelector: - name: ucp-maas-global - actions: - - method: merge - path: . - storagePolicy: cleartext - substitutions: - - src: - schema: pegleg/CommonAddresses/v1 - name: common-addresses - path: .vip.maas_vip - dest: - path: .values.network.maas_ingress.addr -data: - values: - network: - region_api: - node_port: - enabled: true -... diff --git a/type/cntt/software/charts/ucp/drydock/chart-group.yaml b/type/cntt/software/charts/ucp/drydock/chart-group.yaml new file mode 100644 index 0000000..02236b5 --- /dev/null +++ b/type/cntt/software/charts/ucp/drydock/chart-group.yaml @@ -0,0 +1,14 @@ +--- +schema: armada/ChartGroup/v1 +metadata: + schema: metadata/Document/v1 + name: ucp-drydock-scaled + layeringDefinition: + abstract: false + layer: type + storagePolicy: cleartext +data: + description: Drydock + chart_group: + - ucp-maas-scaled + - ucp-drydock diff --git a/type/cntt/software/charts/ucp/drydock/drydock.yaml b/type/cntt/software/charts/ucp/drydock/drydock.yaml new file mode 100644 index 0000000..1343340 --- /dev/null +++ b/type/cntt/software/charts/ucp/drydock/drydock.yaml @@ -0,0 +1,25 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + replacement: true + name: ucp-drydock + labels: + name: ucp-drydock-type + layeringDefinition: + abstract: false + layer: type + parentSelector: + name: ucp-drydock-global + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + values: + network: + api: + ingress: + classes: + cluster: maas-ingress +... diff --git a/type/cntt/software/charts/ucp/drydock/maas-scaled.yaml b/type/cntt/software/charts/ucp/drydock/maas-scaled.yaml new file mode 100644 index 0000000..531a9f3 --- /dev/null +++ b/type/cntt/software/charts/ucp/drydock/maas-scaled.yaml @@ -0,0 +1,32 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: ucp-maas-scaled + layeringDefinition: + abstract: false + layer: type + parentSelector: + name: ucp-maas-global + actions: + - method: merge + path: . + storagePolicy: cleartext + substitutions: + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .vip.maas_vip + dest: + path: .values.network.maas_ingress.addr +data: + values: + network: + region_api: + node_port: + enabled: true + pod: + replicas: + region: 2 + rack: 2 +... diff --git a/type/cntt/software/charts/ucp/drydock/maas.yaml b/type/cntt/software/charts/ucp/drydock/maas.yaml new file mode 100644 index 0000000..d22cf55 --- /dev/null +++ b/type/cntt/software/charts/ucp/drydock/maas.yaml @@ -0,0 +1,29 @@ +--- +# This file defines site-specific deviations for MaaS. +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + name: ucp-maas + layeringDefinition: + abstract: false + layer: type + parentSelector: + name: ucp-maas-global + actions: + - method: merge + path: . + storagePolicy: cleartext + substitutions: + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .vip.maas_vip + dest: + path: .values.network.maas_ingress.addr +data: + values: + network: + region_api: + node_port: + enabled: true +... -- cgit 1.2.3-korg