openstack/openstack-helm-infra
Code Issues Proposed changes

Ceph-RGW: Fix configmap-bin template

Browse Source 
This changes the conditional check for including the configmap-bin
template in the ceph-rgw chart to their original state, and also
adds the rgw-s3-admin.sh script that was removed unintentionally

Change-Id: I60c3660a5bca37199effcf74f3060059345a327b
This commit is contained in:
Steve Wilkerson 2018-09-06 13:24:11 -05:00
parent 06a58f9bd4
commit fe437272b4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ceph-rgw/templates/configmap-bin.yaml
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/}} */}}
{{- if or (.Values.deployment.rgw_keystone_user_and_endpoints) (.Values.deployment.ceph) }} {{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }}
{{- $envAll := . }} {{- $envAll := . }}
--- ---
apiVersion: v1 apiVersion: v1
@ -38,5 +38,6 @@ data:
{{ tuple "bin/_ceph-rgw-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_ceph-rgw-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
ceph-admin-keyring.sh: | ceph-admin-keyring.sh: |
{{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_ceph-admin-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
rgw-s3-admin.sh: |
{{ tuple "bin/rgw/_rgw-s3-admin.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }} {{- end }}