openstack/openstack-helm
Code Issues Proposed changes

Update ceph ansible with some changes for the upstream. (#155)

Browse Source 
1. fix a container name
2. Fix mds networking parameters.
3. Make rgw not a host network container.
This commit is contained in:
Greg Althaus 2017-01-29 12:46:52 -06:00 committed by Alan Meadows
parent f4e3d82888
commit 0cf9463c8a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ spec:
secret: secret:
secretName: ceph-bootstrap-rgw-keyring secretName: ceph-bootstrap-rgw-keyring
containers: containers:
- name: ceph-mon - name: ceph-mds
image: {{ .Values.images.daemon }} image: {{ .Values.images.daemon }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
ports: ports:

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

@ -42,8 +42,8 @@ spec:
value: MON_HEALTH value: MON_HEALTH
- name: KV_TYPE - name: KV_TYPE
value: k8s value: k8s
- name: NETWORK_AUTO_DETECT - name: MON_IP_AUTO_DETECT
value: "4" value: "1"
- name: CLUSTER - name: CLUSTER
value: ceph value: ceph
volumeMounts: volumeMounts:

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

@ -16,7 +16,6 @@ spec:
app: ceph app: ceph
daemon: rgw daemon: rgw
spec: spec:
hostNetwork: true
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
serviceAccount: default serviceAccount: default