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

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

View File

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

View File

@ -42,8 +42,8 @@ spec:
value: MON_HEALTH
- name: KV_TYPE
value: k8s
- name: NETWORK_AUTO_DETECT
value: "4"
- name: MON_IP_AUTO_DETECT
value: "1"
- name: CLUSTER
value: ceph
volumeMounts:
@ -61,4 +61,4 @@ spec:
cpu: {{ .Values.resources.mon_check.requests.cpu | quote }}
limits:
memory: {{ .Values.resources.mon_check.limits.memory | quote }}
cpu: {{ .Values.resources.mon_check.limits.cpu | quote }}
cpu: {{ .Values.resources.mon_check.limits.cpu | quote }}

View File

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