openstack/openstack-helm
Code Issues Proposed changes

Ceph: Chart template tidy

Browse Source 
This PS tidies many of the templates in the Ceph chart.

Change-Id: Ib4c609349edc8d017c0ca30580afedeb9ccbecdb
This commit is contained in:
portdirect 2018-01-19 20:22:34 -05:00
parent dbb778a784
commit 72a91e80f7
38 changed files with 233 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph/templates/configmap-bin-clients.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.configmap_bin_clients }}
{{- if and .Values.manifests.configmap_bin_clients .Values.deployment.client_secrets }}
{{- $envAll := . }}
{{- if .Values.deployment.client_secrets }}
---
apiVersion: v1
kind: ConfigMap
@ -28,4 +27,3 @@ data:
ceph-namespace-client-key-cleaner.sh: |+
{{ tuple "bin/_ceph-namespace-client-key-cleaner.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

4
ceph/templates/configmap-bin-ks.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.configmap_bin_ks }}
{{- if and .Values.manifests.configmap_bin_ks .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $envAll := . }}
{{- if .Values.deployment.rgw_keystone_user_and_endpoints }}
---
apiVersion: v1
kind: ConfigMap
@ -30,4 +29,3 @@ data:
ks-user.sh: |+
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
{{- end }}
{{- end }}

4
ceph/templates/configmap-bin.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.configmap_bin }}
{{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
---
apiVersion: v1
kind: ConfigMap
@ -88,4 +87,3 @@ data:
ceph_rbd_pool.sh: |
{{ tuple "bin/_ceph_rbd_pool.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

4
ceph/templates/configmap-templates.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.configmap_templates }}
{{- if and .Values.manifests.configmap_templates .Values.deployment.storage_secrets }}
{{- $envAll := . }}
{{- if .Values.deployment.storage_secrets }}
---
apiVersion: v1
kind: ConfigMap
@ -36,4 +35,3 @@ data:
mon.keyring: |+
{{ tuple "templates/_mon.keyring.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- end }}

15
ceph/templates/daemonset-mon.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.daemonset_mon }}
{{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- $dependencies := .Values.dependencies.mon }}
{{- $serviceAccountName := "ceph-mon"}}
@ -82,9 +81,6 @@ spec:
- name: pod-var-lib-ceph
mountPath: /var/lib/ceph
readOnly: false
- name: mon-directory
mountPath: /var/lib/ceph/mon
readOnly: false
- name: pod-run
mountPath: /run
readOnly: false
@ -186,9 +182,6 @@ spec:
- name: pod-var-lib-ceph
mountPath: /var/lib/ceph
readOnly: false
- name: mon-directory
mountPath: /var/lib/ceph/mon
readOnly: false
- name: pod-run
mountPath: /run
readOnly: false
@ -203,13 +196,10 @@ spec:
defaultMode: 0444
- name: pod-var-lib-ceph
hostPath:
path: {{ .Values.ceph.storage.mon_directory }}
path: {{ .Values.conf.storage.mon.directory }}
- name: pod-run
emptyDir:
medium: "Memory"
- name: mon-directory
hostPath:
path: {{ .Values.ceph.storage.mon_directory }}
- name: ceph-client-admin-keyring
secret:
secretName: {{ .Values.secrets.keyrings.admin }}
@ -226,4 +216,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.rgw }}
{{- end }}
{{- end }}

2
ceph/templates/daemonset-osd.yaml
View File

@ -180,7 +180,7 @@ spec:
secretName: {{ .Values.secrets.keyrings.rgw }}
- name: osd-directory
hostPath:
path: {{ .Values.ceph.storage.osd_directory }}
path: {{ .Values.conf.storage.osd.directory }}
{{- end }}
{{- end }}

4
ceph/templates/deployment-cephfs-provisioner.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.deployment_cephfs_provisioner }}
{{- if and .Values.manifests.deployment_cephfs_provisioner .Values.deployment.cephfs_provisioner }}
{{- $envAll := . }}
{{- if .Values.deployment.cephfs_provisioner }}
{{- $dependencies := .Values.dependencies.cephfs_provisioner }}
{{- $serviceAccountName := "ceph-cephfs-provisioner"}}
@ -172,4 +171,3 @@ spec:
name: ceph-bin
defaultMode: 0555
{{- end }}
{{- end }}

6
ceph/templates/deployment-mds.yaml
View File

@ -14,10 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.deployment_mds }}
{{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- if .Values.ceph.enabled.mds }}
{{- $dependencies := .Values.dependencies.mds }}
{{- $serviceAccountName := "ceph-mds"}}
@ -156,5 +154,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.rgw }}
{{- end }}
{{- end }}
{{- end }}

6
ceph/templates/deployment-mgr.yaml
View File

@ -14,10 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.deployment_mgr }}
{{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- if .Values.ceph.enabled.mgr }}
{{- $dependencies := .Values.dependencies.mgr }}
{{- $serviceAccountName := "ceph-mgr"}}
@ -183,5 +181,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.mgr }}
{{- end }}
{{- end }}
{{- end }}

4
ceph/templates/deployment-moncheck.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.deployment_moncheck }}
{{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- $dependencies := .Values.dependencies.moncheck }}
{{- $serviceAccountName := "ceph-mon-check"}}
@ -147,4 +146,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.rgw }}
{{- end }}
{{- end }}

4
ceph/templates/deployment-rbd-provisioner.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.deployment_rbd_provisioner }}
{{- if and .Values.manifests.deployment_rbd_provisioner .Values.deployment.rbd_provisioner }}
{{- $envAll := . }}
{{- if .Values.deployment.rbd_provisioner }}
{{- $dependencies := .Values.dependencies.rbd_provisioner }}
{{- $serviceAccountName := "ceph-rbd-provisioner"}}
@ -162,4 +161,3 @@ spec:
name: ceph-bin
defaultMode: 0555
{{- end }}
{{- end }}

10
ceph/templates/deployment-rgw.yaml
View File

@ -14,10 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.deployment_rgw }}
{{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- if .Values.ceph.enabled.rgw }}
{{- $dependencies := .Values.dependencies.rgw }}
{{- $serviceAccountName := "ceph-rgw"}}
@ -61,7 +59,7 @@ spec:
- name: pod-run
mountPath: /run
readOnly: false
{{ if .Values.ceph.rgw_keystone_auth }}
{{ if .Values.conf.rgw_ks.enabled }}
- name: ceph-rgw-ks-init
image: {{ .Values.images.tags.ceph_daemon }}
imagePullPolicy: {{ .Values.images.pull_policy }}
@ -119,7 +117,7 @@ spec:
volumeMounts:
- name: pod-etc-ceph
mountPath: /etc/ceph
{{- if not .Values.ceph.rgw_keystone_auth }}
{{- if not .Values.conf.rgw_ks.enabled }}
- name: ceph-etc
mountPath: /etc/ceph/ceph.conf
subPath: ceph.conf
@ -195,5 +193,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.rgw }}
{{- end }}
{{- end }}
{{- end }}

4
ceph/templates/job-bootstrap.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_bootstrap }}
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
{{- $envAll := . }}
{{- if .Values.bootstrap.enabled }}
{{- $dependencies := .Values.dependencies.bootstrap }}
{{- $serviceAccountName := "ceph-bootstrap"}}
@ -71,4 +70,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.admin }}
{{- end }}
{{- end }}

4
ceph/templates/job-cephfs-client-key.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_cephfs_client_key }}
{{- if and .Values.manifests.job_cephfs_client_key .Values.deployment.cephfs_provisioner }}
{{- $envAll := . }}
{{- if .Values.deployment.cephfs_provisioner }}
{{- $dependencies := .Values.dependencies.cephfs_client_key_generator }}
{{- $randStringSuffix := randAlphaNum 5 | lower }}
@ -124,4 +123,3 @@ spec:
name: ceph-bin
defaultMode: 0555
{{- end }}
{{- end }}

4
ceph/templates/job-keyring.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_keyring }}
{{- if and .Values.manifests.job_keyring .Values.deployment.storage_secrets }}
{{- $envAll := . }}
{{- if .Values.deployment.storage_secrets }}
{{- range $key1, $cephBootstrapKey := tuple "mds" "osd" "rgw" "mon" "mgr" }}
{{- if not (and (not $envAll.Values.manifests.deployment_rgw) (eq $cephBootstrapKey "rgw")) }}
{{- $jobName := print $cephBootstrapKey "-keyring-generator" }}
@ -121,4 +120,3 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- end }}

4
ceph/templates/job-ks-endpoints.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_ks_endpoints }}
{{- if and .Values.manifests.job_ks_endpoints .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $envAll := . }}
{{- if .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
{{- $serviceAccountName := "ceph-ks-endpoints" }}
@ -72,4 +71,3 @@ spec:
name: ceph-bin-ks
defaultMode: 0555
{{- end }}
{{- end }}

4
ceph/templates/job-ks-service.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_ks_service }}
{{- if and .Values.manifests.job_ks_service .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $envAll := . }}
{{- if .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $dependencies := .Values.dependencies.ks_service }}
{{- $serviceAccountName := "ceph-ks-service" }}
@ -66,4 +65,3 @@ spec:
name: ceph-bin-ks
defaultMode: 0555
{{- end }}
{{- end }}

4
ceph/templates/job-ks-user.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_ks_user }}
{{- if and .Values.manifests.job_ks_user .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $envAll := . }}
{{- if .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $dependencies := .Values.dependencies.ks_user }}
{{- $serviceAccountName := "ceph-ks-user" }}
@ -67,4 +66,3 @@ spec:
name: ceph-bin-ks
defaultMode: 0555
{{- end }}
{{- end }}

4
ceph/templates/job-namespace-client-key-cleaner.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_namespace_client_key_cleaner }}
{{- if and .Values.manifests.job_namespace_client_key_cleaner .Values.deployment.client_secrets }}
{{- $envAll := . }}
{{- if .Values.deployment.client_secrets }}
{{- $dependencies := .Values.dependencies.namespace_client_key_cleaner }}
{{- $randStringSuffix := randAlphaNum 5 | lower }}
@ -98,4 +97,3 @@ spec:
name: ceph-bin-clients
defaultMode: 0555
{{- end }}
{{- end }}

4
ceph/templates/job-namespace-client-key.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_namespace_client_key }}
{{- if and .Values.manifests.job_namespace_client_key .Values.deployment.client_secrets }}
{{- $envAll := . }}
{{- if .Values.deployment.client_secrets }}
{{- $dependencies := .Values.dependencies.namespace_client_key_generator }}
{{- $randStringSuffix := randAlphaNum 5 | lower }}
@ -124,4 +123,3 @@ spec:
name: ceph-bin-clients
defaultMode: 0555
{{- end }}
{{- end }}

4
ceph/templates/job-rbd-pool.yaml
View File

@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_rbd_pool }}
{{- if .Values.deployment.ceph }}
{{- if and .Values.manifests.job_rbd_pool .Values.deployment.ceph }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.rbd_pool }}
@ -96,4 +95,3 @@ spec:
secret:
secretName: {{ .Values.secrets.keyrings.admin }}
{{- end }}
{{- end }}

4
ceph/templates/job-storage-admin-keys.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.job_storage_admin_keys }}
{{- if and .Values.manifests.job_storage_admin_keys .Values.deployment.storage_secrets }}
{{- $envAll := . }}
{{- if .Values.deployment.storage_secrets }}
{{- $dependencies := .Values.dependencies.storage_keys_generator }}
{{- $serviceAccountName := "ceph-storage-keys-generator" }}
@ -110,4 +109,3 @@ spec:
name: ceph-templates
defaultMode: 0444
{{- end }}
{{- end }}

4
ceph/templates/secret-keystone-rgw.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.secret_keystone_rgw }}
{{- if and .Values.manifests.secret_keystone_rgw .Values.deployment.ceph }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- range $key1, $userClass := tuple "swift" }}
{{- $secretName := index $envAll.Values.secrets.identity "user_rgw" }}
---
@ -29,4 +28,3 @@ data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
{{- end }}
{{- end }}
{{- end }}

4
ceph/templates/secret-keystone.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.secret_keystone }}
{{- if and .Values.manifests.secret_keystone .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- $envAll := . }}
{{- if .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- range $key1, $userClass := tuple "admin" "swift" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}
---
@ -29,4 +28,3 @@ data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
{{- end }}
{{- end }}
{{- end }}

6
ceph/templates/service-mgr.yaml
View File

@ -14,11 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.service_mgr }}
{{- if and .Values.manifests.service_mgr ( and .Values.deployment.ceph .Values.conf.features.mgr )}}
{{- $envAll := . }}
{{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.ceph_mgr }}
{{- if .Values.deployment.ceph }}
{{- if .Values.ceph.enabled.mgr }}
---
apiVersion: v1
kind: Service
@ -36,5 +34,3 @@ spec:
selector:
{{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- end }}
{{- end }}
{{- end }}

4
ceph/templates/service-mon-discovery.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.service_mon_discovery }}
{{- if and .Values.manifests.service_mon_discovery .Values.deployment.ceph }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
---
kind: Service
apiVersion: v1
@ -39,4 +38,3 @@ spec:
{{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
clusterIP: None
{{- end }}
{{- end }}

4
ceph/templates/service-mon.yaml
View File

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.service_mon }}
{{- if and .Values.manifests.service_mon .Values.deployment.ceph }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
---
kind: Service
apiVersion: v1
@ -31,4 +30,3 @@ spec:
{{ tuple $envAll "ceph" "mon" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
clusterIP: None
{{- end }}
{{- end }}

6
ceph/templates/service-rgw.yaml
View File

@ -14,10 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.service_rgw }}
{{- if and .Values.manifests.service_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- if .Values.ceph.enabled.rgw }}
---
apiVersion: v1
kind: Service
@ -31,5 +29,3 @@ spec:
selector:
{{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- end }}
{{- end }}
{{- end }}

6
ceph/templates/storageclass-cephfs.yaml
View File

@ -14,10 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.storageclass }}
{{- if and .Values.manifests.storageclass_cephfs ( and .Values.deployment.ceph .Values.storageclass.cephfs.provision_storage_class ) }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- if .Values.storageclass.cephfs.provision_storage_class }}
---
kind: StorageClass
apiVersion: storage.k8s.io/v1
@ -30,5 +28,3 @@ parameters:
adminSecretName: {{ .Values.storageclass.cephfs.user_secret_name | quote }}
adminSecretNamespace: {{ .Release.Namespace | quote }}
{{- end }}
{{- end }}
{{- end }}

6
ceph/templates/storageclass.yaml → ceph/templates/storageclass-rbd.yaml
View File

@ -14,10 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if .Values.manifests.storageclass }}
{{- if and .Values.manifests.storageclass_rbd (and .Values.deployment.ceph .Values.storageclass.rbd.provision_storage_class) }}
{{- $envAll := . }}
{{- if .Values.deployment.ceph }}
{{- if .Values.storageclass.rbd.provision_storage_class }}
---
apiVersion: storage.k8s.io/v1
kind: StorageClass
@ -35,5 +33,3 @@ parameters:
imageFormat: {{ .Values.storageclass.rbd.image_format | quote }}
imageFeatures: {{ .Values.storageclass.rbd.image_features }}
{{- end }}
{{- end }}
{{- end }}

23
ceph/values.yaml
View File

@ -184,7 +184,17 @@ network:
mgr: 7000
conf:
storage:
osd:
directory: /var/lib/openstack-helm/ceph/osd
mon:
directory: /var/lib/openstack-helm/ceph/mon
features:
mds: true
rgw: true
mgr: true
rgw_ks:
enabled: false
config:
rgw_keystone_api_version: 3
rgw_keystone_accepted_roles: "admin, _member_"
@ -295,16 +305,6 @@ dependencies:
- service: ceph_mon
endpoint: internal
ceph:
rgw_keystone_auth: false
enabled:
mds: true
rgw: true
mgr: true
storage:
osd_directory: /var/lib/openstack-helm/ceph/osd
mon_directory: /var/lib/openstack-helm/ceph/mon
bootstrap:
enabled: false
script: |
@ -476,4 +476,5 @@ manifests:
service_mon: true
service_mon_discovery: true
service_rgw: true
storageclass: true
storageclass_cephfs: true
storageclass_rbd: true

50
tools/deployment/developer/ceph/040-ceph.sh
View File

@ -20,22 +20,40 @@ set -xe
make pull-images ceph
#NOTE: Deploy command
WORK_DIR=$(pwd)
helm install --namespace=ceph ${WORK_DIR}/ceph --name=ceph \
--set endpoints.identity.namespace=openstack \
--set endpoints.object_store.namespace=ceph \
--set endpoints.ceph_mon.namespace=ceph \
--set ceph.rgw_keystone_auth=true \
--set network.public=172.17.0.1/16 \
--set network.cluster=172.17.0.1/16 \
--set deployment.storage_secrets=true \
--set deployment.ceph=true \
--set deployment.rbd_provisioner=true \
--set deployment.cephfs_provisioner=true \
--set deployment.client_secrets=false \
--set deployment.rgw_keystone_user_and_endpoints=false \
--set bootstrap.enabled=true \
--values=${WORK_DIR}/tools/overrides/mvp/ceph.yaml
cat > /tmp/ceph.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: 172.17.0.1/16
cluster: 172.17.0.1/16
deployment:
storage_secrets: true
ceph: true
rbd_provisioner: true
cephfs_provisioner: true
client_secrets: false
rgw_keystone_user_and_endpoints: false
bootstrap:
enabled: true
conf:
rgw_ks:
enabled: true
ceph:
config:
global:
osd_pool_default_size: 1
osd:
osd_crush_chooseleaf_type: 0
EOF
helm install ./ceph \
--namespace=ceph \
--name=ceph \
--values=/tmp/ceph.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph

49
tools/deployment/developer/ceph/045-ceph-ns-activate.sh
View File

@ -20,21 +20,40 @@ set -xe
make pull-images ceph
#NOTE: Deploy command
WORK_DIR=$(pwd)
helm install --namespace=openstack ${WORK_DIR}/ceph --name=ceph-openstack-config \
--set endpoints.identity.namespace=openstack \
--set endpoints.object_store.namespace=ceph \
--set endpoints.ceph_mon.namespace=ceph \
--set ceph.rgw_keystone_auth=true \
--set network.public=172.17.0.1/16 \
--set network.cluster=172.17.0.1/16 \
--set deployment.storage_secrets=false \
--set deployment.ceph=false \
--set deployment.rbd_provisioner=false \
--set deployment.cephfs_provisioner=false \
--set deployment.client_secrets=true \
--set deployment.rgw_keystone_user_and_endpoints=false \
--values=${WORK_DIR}/tools/overrides/mvp/ceph.yaml
cat > /tmp/ceph-openstack-config.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: 172.17.0.1/16
cluster: 172.17.0.1/16
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: true
rgw_keystone_user_and_endpoints: false
bootstrap:
enabled: false
conf:
rgw_ks:
enabled: true
ceph:
config:
global:
osd_pool_default_size: 1
osd:
osd_crush_chooseleaf_type: 0
EOF
helm install ./ceph \
--namespace=openstack \
--name=ceph-openstack-config \
--values=/tmp/ceph-openstack-config.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack

49
tools/deployment/developer/ceph/110-ceph-radosgateway.sh
View File

@ -20,21 +20,40 @@ set -xe
make pull-images ceph
#NOTE: Deploy command
WORK_DIR=$(pwd)
helm install --namespace=openstack ${WORK_DIR}/ceph --name=radosgw-openstack \
--set endpoints.identity.namespace=openstack \
--set endpoints.object_store.namespace=ceph \
--set endpoints.ceph_mon.namespace=ceph \
--set ceph.rgw_keystone_auth=true \
--set network.public=172.17.0.1/16 \
--set network.cluster=172.17.0.1/16 \
--set deployment.storage_secrets=false \
--set deployment.ceph=false \
--set deployment.rbd_provisioner=false \
--set deployment.cephfs_provisioner=false \
--set deployment.client_secrets=false \
--set deployment.rgw_keystone_user_and_endpoints=true \
--values=${WORK_DIR}/tools/overrides/mvp/ceph.yaml
cat > /tmp/radosgw-openstack.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: 172.17.0.1/16
cluster: 172.17.0.1/16
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: false
rgw_keystone_user_and_endpoints: true
bootstrap:
enabled: false
conf:
rgw_ks:
enabled: true
ceph:
config:
global:
osd_pool_default_size: 1
osd:
osd_crush_chooseleaf_type: 0
EOF
helm install ./ceph \
--namespace=openstack \
--name=radosgw-openstack \
--values=/tmp/radosgw-openstack.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack

43
tools/deployment/multinode/030-ceph.sh
View File

@ -17,21 +17,36 @@
set -xe
#NOTE: Deploy command
CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
cat > /tmp/ceph.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: ${CEPH_PUBLIC_NETWORK}
cluster: ${CEPH_CLUSTER_NETWORK}
deployment:
storage_secrets: true
ceph: true
rbd_provisioner: true
cephfs_provisioner: true
client_secrets: false
rgw_keystone_user_and_endpoints: false
bootstrap:
enabled: true
conf:
rgw_ks:
enabled: true
EOF
helm install ./ceph \
--namespace=ceph \
--name=ceph \
--set endpoints.identity.namespace=openstack \
--set endpoints.object_store.namespace=ceph \
--set endpoints.ceph_mon.namespace=ceph \
--set ceph.rgw_keystone_auth=true \
--set network.public=$(./tools/deployment/multinode/kube-node-subnet.sh) \
--set network.cluster=$(./tools/deployment/multinode/kube-node-subnet.sh) \
--set deployment.storage_secrets=true \
--set deployment.ceph=true \
--set deployment.rbd_provisioner=true \
--set deployment.client_secrets=false \
--set deployment.rgw_keystone_user_and_endpoints=false \
--set bootstrap.enabled=true
--namespace=ceph \
--name=ceph \
--values=/tmp/ceph.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph 1200

39
tools/deployment/multinode/040-ceph-ns-activate.sh
View File

@ -17,21 +17,36 @@
set -xe
#NOTE: Deploy command
CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
cat > /tmp/ceph-openstack-config.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: ${CEPH_PUBLIC_NETWORK}
cluster: ${CEPH_CLUSTER_NETWORK}
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: true
rgw_keystone_user_and_endpoints: false
bootstrap:
enabled: false
conf:
rgw_ks:
enabled: true
EOF
helm install ./ceph \
--namespace=openstack \
--name=ceph-openstack-config \
--set endpoints.identity.namespace=openstack \
--set endpoints.object_store.namespace=ceph \
--set endpoints.ceph_mon.namespace=ceph \
--set ceph.rgw_keystone_auth=true \
--set network.public=$(./tools/deployment/multinode/kube-node-subnet.sh) \
--set network.cluster=$(./tools/deployment/multinode/kube-node-subnet.sh) \
--set deployment.storage_secrets=false \
--set deployment.ceph=false \
--set deployment.rbd_provisioner=false \
--set deployment.cephfs_provisioner=false \
--set deployment.client_secrets=true \
--set deployment.rgw_keystone_user_and_endpoints=false
--values=/tmp/ceph-openstack-config.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack

44
tools/deployment/multinode/090-ceph-radosgateway.sh
View File

@ -16,21 +16,37 @@
set -xe
#NOTE: Deploy command
CEPH_PUBLIC_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
CEPH_CLUSTER_NETWORK=$(./tools/deployment/multinode/kube-node-subnet.sh)
cat > /tmp/radosgw-openstack.yaml <<EOF
endpoints:
identity:
namespace: openstack
object_store:
namespace: ceph
ceph_mon:
namespace: ceph
network:
public: ${CEPH_PUBLIC_NETWORK}
cluster: ${CEPH_CLUSTER_NETWORK}
deployment:
storage_secrets: false
ceph: false
rbd_provisioner: false
cephfs_provisioner: false
client_secrets: false
rgw_keystone_user_and_endpoints: true
bootstrap:
enabled: false
conf:
rgw_ks:
enabled: true
EOF
helm install ./ceph \
--namespace=openstack \
--name=radosgw-openstack \
--set endpoints.identity.namespace=openstack \
--set endpoints.object_store.namespace=ceph \
--set endpoints.ceph_mon.namespace=ceph \
--set ceph.rgw_keystone_auth=true \
--set network.public=$(./tools/deployment/multinode/kube-node-subnet.sh) \
--set network.cluster=$(./tools/deployment/multinode/kube-node-subnet.sh) \
--set deployment.storage_secrets=false \
--set deployment.ceph=false \
--set deployment.rbd_provisioner=false \
--set deployment.cephfs_provisioner=false \
--set deployment.client_secrets=false \
--set deployment.rgw_keystone_user_and_endpoints=true
--namespace=openstack \
--name=radosgw-openstack \
--values=/tmp/radosgw-openstack.yaml
#NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack

21
tools/overrides/mvp/ceph.yaml
View File

@ -1,21 +0,0 @@
# Copyright 2017 The Openstack-Helm Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
conf:
ceph:
config:
global:
osd_pool_default_size: 1
osd:
osd_crush_chooseleaf_type: 0