openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Ceph-RGW: fix helm test"

Browse Source
This commit is contained in:
Zuul 2019-08-26 18:43:49 +00:00 committed by Gerrit Code Review
commit 49c8c744ac
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph-rgw/templates/bin/_helm-tests.sh.tpl
View File

@ -144,13 +144,13 @@ function rgw_s3_bucket_validation ()
fi fi
} }
if [ {{ .Values.conf.rgw_ks.enabled }} == true ]; if [ "$RGW_TEST_TYPE" == RGW_KS ];
then then
echo "--> Keystone is enabled. Calling function to test keystone based auth " echo "--> Keystone is enabled. Calling function to test keystone based auth "
rgw_keystone_bucket_validation rgw_keystone_bucket_validation
fi fi
if [ {{ .Values.conf.rgw_s3.enabled }} == true ]; if [ "$RGW_TEST_TYPE" == RGW_S3 ];
then then
echo "--> S3 is enabled. Calling function to test S3 based auth " echo "--> S3 is enabled. Calling function to test S3 based auth "
rgw_s3_bucket_validation rgw_s3_bucket_validation

4
ceph-rgw/templates/pod-helm-tests.yaml
View File

@ -52,6 +52,8 @@ spec:
name: {{ $.Values.secrets.identity.user_rgw }} name: {{ $.Values.secrets.identity.user_rgw }}
key: OS_TENANT_NAME key: OS_TENANT_NAME
{{- end }} {{- end }}
- name: "RGW_TEST_TYPE"
value: "RGW_KS"
command: command:
- /tmp/helm-tests.sh - /tmp/helm-tests.sh
volumeMounts: volumeMounts:
@ -82,6 +84,8 @@ spec:
{{- end }} {{- end }}
- name: RGW_HOST - name: RGW_HOST
value: {{ tuple "ceph_object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }} value: {{ tuple "ceph_object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
- name: "RGW_TEST_TYPE"
value: "RGW_S3"
command: command:
- /tmp/helm-tests.sh - /tmp/helm-tests.sh
volumeMounts: volumeMounts: