7929c94c21
* Made values.yaml consistent throughout charts. Removed any globals references in subcharts as these are difficult to override. Only ports should be in globals to build URLs which can come as part of a future commit. The hostname endpoint aspect of a service will come from openstack-base/_hosts.tpl and the port would come from the chart itself as a global so other charts can reference the port to build a complete URL. Putting the hostnames themselves as globals in individual charts makes it difficult to make a sweeping top level FQDN change. * Cleaned up yaml requirements and incorporated a new _common.tpl that is distributed to all charts to allow common endpoint naming while still retaining the ability to install individual charts. * Fixed keystone URL generation during bootstrap as a correct URL is critical given keystone uses this to construct all subsequent URLs in the request. Also allow controlling the default endpoint version and scheme. * Added missing NAMESPACE declaration to keystone deployment as this is required for entrypoint to discover resources not in the 'default' namespace. * Refactored all nodeSelector values to be consistent throughout all charts
88 lines
2.4 KiB
YAML
88 lines
2.4 KiB
YAML
---
|
|
kind: DaemonSet
|
|
apiVersion: extensions/v1beta1
|
|
metadata:
|
|
name: ceph-osd
|
|
labels:
|
|
app: ceph
|
|
daemon: osd
|
|
spec:
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app: ceph
|
|
daemon: osd
|
|
spec:
|
|
nodeSelector:
|
|
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
|
|
volumes:
|
|
- name: devices
|
|
hostPath:
|
|
path: /dev
|
|
- name: ceph
|
|
emptyDir: {}
|
|
# hostPath:
|
|
# path: /opt/ceph
|
|
- name: ceph-conf
|
|
secret:
|
|
secretName: ceph-conf-combined
|
|
- name: ceph-bootstrap-osd-keyring
|
|
secret:
|
|
secretName: ceph-bootstrap-osd-keyring
|
|
- name: ceph-bootstrap-mds-keyring
|
|
secret:
|
|
secretName: ceph-bootstrap-mds-keyring
|
|
- name: ceph-bootstrap-rgw-keyring
|
|
secret:
|
|
secretName: ceph-bootstrap-rgw-keyring
|
|
- name: osd-directory
|
|
emptyDir: {}
|
|
# hostPath:
|
|
# path: /home/core/data/ceph/osd
|
|
containers:
|
|
- name: osd-pod
|
|
image: {{ .Values.images.daemon }}
|
|
imagePullPolicy: Always
|
|
volumeMounts:
|
|
- name: devices
|
|
mountPath: /dev
|
|
- name: ceph
|
|
mountPath: /var/lib/ceph
|
|
- name: ceph-conf
|
|
mountPath: /etc/ceph
|
|
- name: ceph-bootstrap-osd-keyring
|
|
mountPath: /var/lib/ceph/bootstrap-osd
|
|
- name: ceph-bootstrap-mds-keyring
|
|
mountPath: /var/lib/ceph/bootstrap-mds
|
|
- name: ceph-bootstrap-rgw-keyring
|
|
mountPath: /var/lib/ceph/bootstrap-rgw
|
|
- name: osd-directory
|
|
mountPath: /var/lib/ceph/osd
|
|
securityContext:
|
|
privileged: true
|
|
env:
|
|
- name: CEPH_DAEMON
|
|
value: osd_directory
|
|
- name: KV_TYPE
|
|
value: k8s
|
|
- name: CLUSTER
|
|
value: ceph
|
|
- name: CEPH_GET_ADMIN_KEY
|
|
value: "1"
|
|
livenessProbe:
|
|
tcpSocket:
|
|
port: 6800
|
|
initialDelaySeconds: 60
|
|
timeoutSeconds: 5
|
|
readinessProbe:
|
|
tcpSocket:
|
|
port: 6800
|
|
timeoutSeconds: 5
|
|
resources:
|
|
requests:
|
|
memory: "512Mi"
|
|
cpu: "1000m"
|
|
limits:
|
|
memory: "1024Mi"
|
|
cpu: "2000m"
|