openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "Ceph-RGW code cleanup"

This commit is contained in:
Zuul 2019-03-15 07:40:49 +00:00 committed by Gerrit Code Review
parent e1b729e660 3552406832
commit d992de6245
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-rgw/templates/configmap-bin-ks.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.configmap_bin_ks .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- if and .Values.manifests.configmap_bin_ks .Values.conf.rgw_ks.enabled }}
{{- $envAll := . }}
---
apiVersion: v1

2
ceph-rgw/templates/job-ks-endpoints.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.job_ks_endpoints .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- if and .Values.manifests.job_ks_endpoints .Values.conf.rgw_ks.enabled }}
{{- $ksServiceJob := dict "envAll" . "configMapBin" "ceph-rgw-bin-ks" "serviceName" "ceph" "serviceTypes" ( tuple "object-store" ) -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
{{- end }}

2
ceph-rgw/templates/job-ks-service.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.job_ks_service .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- if and .Values.manifests.job_ks_service .Values.conf.rgw_ks.enabled }}
{{- $ksServiceJob := dict "envAll" . "configMapBin" "ceph-rgw-bin-ks" "serviceName" "ceph" "serviceTypes" ( tuple "object-store" ) -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
{{- end }}

2
ceph-rgw/templates/job-ks-user.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.job_ks_user .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- if and .Values.manifests.job_ks_user .Values.conf.rgw_ks.enabled }}
{{- $ksUserJob := dict "envAll" . "configMapBin" "ceph-rgw-bin-ks" "serviceName" "ceph" "serviceUser" "swift" -}}
{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
{{- end }}

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

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.secret_keystone .Values.deployment.rgw_keystone_user_and_endpoints }}
{{- if and .Values.manifests.secret_keystone .Values.conf.rgw_ks.enabled }}
{{- $envAll := . }}
{{- range $key1, $userClass := tuple "admin" "swift" }}
{{- $secretName := index $envAll.Values.secrets.identity $userClass }}

1
ceph-rgw/values.yaml
View File

@ -19,7 +19,6 @@
deployment:
ceph: false
rgw_keystone_user_and_endpoints: false
release_group: null